fixed some awkward queuing that could occur post-calibration