Fix destroy method
Merge branch 'fix-destroy' into develop