Fixed bug with calibrator