Hacks fixes #4