Fix offsetting (not yet)