Remove dirty trick to fix number of measurements.