- dirty hack removed