Fixing the hack