removed dirty hack for test purposes