Fix for another fix