fixed recognition of entities