Fix the fix that broke the fix that broke the fix