Fix indexing in measurements.