diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index cc14a2e44879b02c97c88c9114341a177d39fd76..f5338424c9037fa21c15592dde66f8757fe59fbf 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -987,7 +987,7 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
 	size = IndexTupleSize(datum) - sizeof(IndexTupleData);
 	datum += sizeof(IndexTupleData);
 	gistdentryinit(giststate,&entry,datum,r,p,i,size,FALSE);
-	(giststate->penaltyFn)(entry, identry, &usize);
+	(giststate->penaltyFn)(&entry, &identry, &usize);
 	if (which_grow < 0 || usize < which_grow) {
 	    which = i;
 	    which_grow = usize;
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 4629de12922282fd207f1b71972e30e14be9b9a6..c877538472c79a714fce6a2430725b82414c07be 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -118,6 +118,13 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
 	gistfreestack(p->s_markstk);
 	p->s_stack = p->s_markstk = (GISTSTACK *) NULL;
 	p->s_flags = 0x0;
+	for (i = 0; i < s->numberOfKeys; i++)
+	{
+	    s->keyData[i].sk_procedure 
+		= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno, 
+					  s->keyData[i].sk_procedure);
+	    s->keyData[i].sk_func = p->giststate->consistentFn;
+	}
     } else {
 	/* initialize opaque data */
 	p = (GISTScanOpaque) palloc(sizeof(GISTScanOpaqueData));