Correctly calculate body offset.
Merge branch 'offset-on-touch'