Fix bug in universalentity logic.