Yet another fix for the fix