Fix for the fix... :(