Hacks to make it work