Clean and huge bug on destroy entity fixed