Fix destroy (related to issue #393)