Further horrible hacks