Improve destroying event