fixed entity creation