Called destructor fixed more bugs