Correction to commmit 120863, make sure proper destructor function is called as well...