Entities fix