diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp
index b4aec4013..143af5de0 100644
--- a/dbcon/joblist/tupleaggregatestep.cpp
+++ b/dbcon/joblist/tupleaggregatestep.cpp
@@ -2622,8 +2622,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
             functionVec2[i]->fAuxColumnIndex = lastCol;
 
             // sum(x)
-            oidsAggDist.push_back(oidsAggDist[j]);
-            keysAggDist.push_back(keysAggDist[j]);
+            oidsAggDist.push_back(oidsAgg[j]);
+            keysAggDist.push_back(keysAgg[j]);
             scaleAggDist.push_back(0);
             precisionAggDist.push_back(0);
             typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -2631,8 +2631,8 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
             ++lastCol;
 
             // sum(x**2)
-            oidsAggDist.push_back(oidsAggDist[j]);
-            keysAggDist.push_back(keysAggDist[j]);
+            oidsAggDist.push_back(oidsAgg[j]);
+            keysAggDist.push_back(keysAgg[j]);
             scaleAggDist.push_back(0);
             precisionAggDist.push_back(-1);
             typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -3667,8 +3667,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
             functionVecUm[i]->fAuxColumnIndex = lastCol;
 
             // sum(x)
-            oidsAggUm.push_back(oidsAggUm[j]);
-            keysAggUm.push_back(keysAggUm[j]);
+            oidsAggUm.push_back(oidsAggPm[j]);
+            keysAggUm.push_back(keysAggPm[j]);
             scaleAggUm.push_back(0);
             precisionAggUm.push_back(-1);
             typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -3676,8 +3676,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
             ++lastCol;
 
             // sum(x**2)
-            oidsAggUm.push_back(oidsAggUm[j]);
-            keysAggUm.push_back(keysAggUm[j]);
+            oidsAggUm.push_back(oidsAggPm[j]);
+            keysAggUm.push_back(keysAggPm[j]);
             scaleAggUm.push_back(0);
             precisionAggUm.push_back(-1);
             typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -4704,8 +4704,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
             functionVecUm[i]->fAuxColumnIndex = lastCol;
 
             // sum(x)
-            oidsAggDist.push_back(oidsAggDist[j]);
-            keysAggDist.push_back(keysAggDist[j]);
+            oidsAggDist.push_back(oidsAggPm[j]);
+            keysAggDist.push_back(keysAggPm[j]);
             scaleAggDist.push_back(0);
             precisionAggDist.push_back(-1);
             typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
@@ -4713,8 +4713,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
             ++lastCol;
 
             // sum(x**2)
-            oidsAggDist.push_back(oidsAggDist[j]);
-            keysAggDist.push_back(keysAggDist[j]);
+            oidsAggDist.push_back(oidsAggPm[j]);
+            keysAggDist.push_back(keysAggPm[j]);
             scaleAggDist.push_back(0);
             precisionAggDist.push_back(-1);
             typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);