ok, so the dirty hack is still needed =/