fix typesystem