Fix destroy callback by specifying class
Reactivate if previously deactivated