diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
new file mode 100644
index 5bf84c1..9ddc8ad
*** a/src/backend/optimizer/plan/setrefs.c
--- b/src/backend/optimizer/plan/setrefs.c
*************** set_plan_refs(PlannerInfo *root, Plan *p
*** 696,701 ****
--- 696,704 ----
  				Assert(splan->plan.targetlist == NIL);
  				Assert(splan->plan.qual == NIL);
  
+ 				splan->withCheckOptionLists =
+ 					fix_scan_list(root, splan->withCheckOptionLists, rtoffset);
+ 
  				if (splan->returningLists)
  				{
  					List	   *newRL = NIL;