Solved issues with addition of Fitting_AllowSwitch