Fix bug with destroy