Fixing the "fixes"