Another measurement tweak