reset offset too
FS-5757 --resolve