Destructor changes aren't effective - go back to the approach I tried before