diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 1382b67..9aeaf87 100644
*** a/src/backend/optimizer/plan/setrefs.c
--- b/src/backend/optimizer/plan/setrefs.c
*************** set_upper_references(PlannerInfo *root, 
*** 1744,1751 ****
  		TargetEntry *tle = (TargetEntry *) lfirst(l);
  		Node	   *newexpr;
  
! 		/* If it's a non-Var sort/group item, first try to match by sortref */
! 		if (tle->ressortgroupref != 0 && !IsA(tle->expr, Var))
  		{
  			newexpr = (Node *)
  				search_indexed_tlist_for_sortgroupref(tle->expr,
--- 1744,1751 ----
  		TargetEntry *tle = (TargetEntry *) lfirst(l);
  		Node	   *newexpr;
  
! 		/* If it's a sort/group item, first try to match by sortref */
! 		if (tle->ressortgroupref != 0)
  		{
  			newexpr = (Node *)
  				search_indexed_tlist_for_sortgroupref(tle->expr,
*************** search_indexed_tlist_for_non_var(Expr *n
*** 2113,2119 ****
  
  /*
   * search_indexed_tlist_for_sortgroupref --- find a sort/group expression
-  *		(which is assumed not to be just a Var)
   *
   * If a match is found, return a Var constructed to reference the tlist item.
   * If no match, return NULL.
--- 2113,2118 ----