Bug fix(calibration)