Correction for class unregistration