fix for fitting manager null ref