Bugfix: make sure entities can be created