Fixed destruction bug (was far worse than I thought!)