fixed endless recursion in destroy