Fixed entity creation.