important bug fix for new iterative first_cal