ONPP operator does not produce expected results about groonga HOT 1 OPEN

diff --git a/lib/ii.c b/lib/ii.c
index 75849fb7c..134525515 100644
--- a/lib/ii.c
+++ b/lib/ii.c
@@ -13533,19 +13533,25 @@ grn_ii_select_cursor_next_find_near(grn_ctx *ctx,
   bool need_check = true;
   if (data->mode == GRN_OP_NEAR_PHRASE ||
       data->mode == GRN_OP_ORDERED_NEAR_PHRASE) {
+    int32_t start_pos = data->pos;
     uint32_t phrase_id;
     for (phrase_id = 0; phrase_id < data->n_phrases; phrase_id++) {
-      if (!grn_ii_select_data_find_phrase(ctx, data, phrase_id, data->pos, 0)) {
+      if (!grn_ii_select_data_find_phrase(ctx, data, phrase_id, start_pos, 0)) {
         need_check = false;
         break;
       }
-      /* TODO: Can we update data->pos to reduce needless search? */
       bt_push(data->bt, data->token_info);
+      if (data->mode == GRN_OP_ORDERED_NEAR_PHRASE &&
+          data->token_info->pos > start_pos) {
+        start_pos = data->token_info->pos;
+      }
+      /* TODO: Can we update data->pos to reduce needless search? */
     }
   } else if (data->mode == GRN_OP_NEAR_PHRASE_PRODUCT ||
              data->mode == GRN_OP_ORDERED_NEAR_PHRASE_PRODUCT) {
     uint32_t i;
     uint32_t phrase_id = 0;
+    int32_t start_pos = data->pos;
     for (i = 0; i < data->n_phrase_groups; i++) {
       phrase_group *group = &(data->phrase_groups[i]);
       bt_zap(group->btree);
@@ -13555,10 +13561,14 @@ grn_ii_select_cursor_next_find_near(grn_ctx *ctx,
         if (grn_ii_select_data_find_phrase(ctx,
                                            data,
                                            phrase_id,
-                                           data->pos,
+                                           start_pos,
                                            0)) {
           have_phrase = true;
           bt_push(group->btree, data->token_info);
+          if (data->mode == GRN_OP_ORDERED_NEAR_PHRASE_PRODUCT &&
+              data->token_info->pos > start_pos) {
+            start_pos = data->token_info->pos;
+          }
           /* TODO: Can we update data->pos to reduce needless search? */
         }
       }
diff --git a/test/command/suite/select/query/ordered_near_phrase_product/same_phrases.test b/test/command/suite/select/query/ordered_near_phrase_product/same_phrases.test
new file mode 100644
index 000000000..2ecd7e858
--- /dev/null
+++ b/test/command/suite/select/query/ordered_near_phrase_product/same_phrases.test
@@ -0,0 +1,19 @@
+table_create Entries TABLE_NO_KEY
+column_create Entries content COLUMN_SCALAR Text
+
+table_create Terms TABLE_PAT_KEY ShortText \
+  --default_tokenizer TokenNgram \
+  --normalizer NormalizerNFKC150
+column_create Terms entries_content COLUMN_INDEX|WITH_POSITION Entries content
+
+load --table Entries
+[
+{"content": "a.b.c.d"},
+{"content": "a[.]b.c[.]d"},
+{"content": "x.y.z"}
+]
+
+select Entries \
+  --match_columns content \
+  --query '*ONPP10"(a) (. [.]) (b) (. [.]) (c) (. [.]) (d)"' \
+  --output_columns '_score, content'