Fix offset issue

Fixes #11