fixed multiple entity deletion
Merge branch 'bugfix' into development