Issue #2388: Added if statement to _resetSubControllers