Another fix for the fix