Added fix for class member delete issue