Fix for the fix