Measure service fix