use nextpartpeek as we don't want to reset the starting point (cherry picked from commit 7b65bea6d2)
7b65bea6d2