Fixing the fix