ugly hotfix for typesystem