Fixed bug with destroy