yey! got rid of ugly hack