Fixes iterator problem when adding/removing entities from entity listeners handlers issue #81