Ugly hack removed