- Fix Destroy
Merge branch 'fixdestroy'