Fixing entity type