Fix destroy order