Re-add the hack