Bugfix: make sure entity can be created