Put some parens in to see if that fixes offset issue.
Merge branch 'pumpoffsets' into current