Fixing 'destroy' bug