Fixed the deconstructor