Fixed that dirty hack