entities fix