Fix deleting entries
Merge pull request #3028 from obrignoni/2.3/develop

Fix deleting entries