Fixing calibration saving