Backport measurement fix