Bugfix for addEntityChoices