This is the fix for the offset issue.