Fix the synchroneous creation of entities.
Formatting