Fixed set on destroy bug