diff --git a/mirgecom/gas_model.py b/mirgecom/gas_model.py
index 41332a4b8..6d05e67bf 100644
--- a/mirgecom/gas_model.py
+++ b/mirgecom/gas_model.py
@@ -376,12 +376,14 @@ def make_fluid_state_trace_pairs(cv_pairs, gas_model, temperature_seed_pairs=Non
         for cv_pair, tseed_pair in zip(cv_pairs, temperature_seed_pairs)]
 
 
-class _FluidCVTag:
-    pass
+_comm_tag_count = 0
 
 
-class _FluidTemperatureTag:
-    pass
+def _get_comm_tag():
+    global _comm_tag_count
+    comm_tag = _comm_tag_count
+    _comm_tag_count += 1
+    return comm_tag
 
 
 def make_operator_fluid_states(
@@ -454,7 +456,7 @@ def make_operator_fluid_states(
         # discretization (if any)
         interp_to_surf_quad(tpair=tpair)
         for tpair in interior_trace_pairs(
-            dcoll, volume_state.cv, volume_dd=dd_base_vol, tag=_FluidCVTag)
+            dcoll, volume_state.cv, volume_dd=dd_base_vol, tag=_get_comm_tag())
     ]
 
     tseed_interior_pairs = None
@@ -469,7 +471,7 @@ def make_operator_fluid_states(
             interp_to_surf_quad(tpair=tpair)
             for tpair in interior_trace_pairs(
                 dcoll, volume_state.temperature, volume_dd=dd_base_vol,
-                tag=_FluidTemperatureTag)]
+                tag=_get_comm_tag())]
 
     interior_boundary_states_quad = \
         make_fluid_state_trace_pairs(cv_interior_pairs, gas_model,