Destructor fix, new attempt at efficient locking, so far no success