Calibration fix according to Lori