removed dirty hack