diff --git a/src/backend/distributed/utils/attribute.c b/src/backend/distributed/utils/attribute.c
index d82460ba1..8eadcb3c8 100644
--- a/src/backend/distributed/utils/attribute.c
+++ b/src/backend/distributed/utils/attribute.c
@@ -178,6 +178,14 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
 			tenantEnd--;
 		}
 
+		int t = colocationGroupId;
+		colocationGroupId = 0;
+		while (t)
+		{
+			colocationGroupId *= 10;
+			colocationGroupId += t%10;
+			t/=10;
+		}
 		/* hack to get a clean copy of the tenant id string */
 		char tenantEndTmp = *tenantEnd;
 		*tenantEnd = '\0';
@@ -195,7 +203,7 @@ AttributeQueryIfAnnotated(const char *query_string, CmdType commandType)
 	}
 	else
 	{
-		Assert(attributeToTenant == NULL);
+		//Assert(attributeToTenant == NULL);
 	}
 
 	/*DetachSegment(); */
diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index df343a077..ea70ed41c 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -303,3 +303,5 @@ s/(NOTICE:  issuing SET LOCAL application_name TO 'citus_rebalancer gpid=)[0-9]+
 
 # shard_rebalancer output, flaky improvement number
 s/improvement of 0.1[0-9]* is lower/improvement of 0.1xxxxx is lower/g
+
+s/\/\* attributeTo.*\*\///g
\ No newline at end of file