Issue #2388: Added if statement to _resetSubControllers
Merge pull request #2475 from amindunited/master

Issue #2388: Added if statement to _resetSubControllers