LPS-49700 Take into account the previous offset as well