Refs #9081 More modifications to the fit function