#682 is fixed, removed redundant offset