Make sure our offset advances so that we don't infinitely loop. Fixes #16887 (closed).
(cherry picked from commit 3ff94065)