Fixed regression in CreateEntity