Now works fine without that dirty hack!