Fix fit widget with new safe_eval