Fixed issue in Calibration