Some hacks to make it work