Fixed minor bug with calibrator