Fix for one of the hacks