hacks to make it work