Updates to fitting for issue @#119