Some hacks to make it work

My bad.