Fix bug preventing first entity creation