Fix for the stupid fix