Since PR #3968 added the preceding lines, should I add the corresponding code for `offsetX` here?