* entitie fix