Entities fix.