fixed issue with Entity's not being destroyed properly