More robust calibration persistence