Fixing hacks