Fix destructor
Backward comptibility