ENG-5708: Fix last matching offset block missing.