Get rid of ugly hack