fix annoying bug
Merge branch 'fix-offset'