improved behaviour on destroy notification