This change is to fix parts of the offset issue.