Fixing and de-hacking