Changed the hack so that it ought to also work when they fix it