Fix confusion in measuring code

Closes #2247