diff --git a/Core/SoarKernel/src/decision_process/rete.cpp b/Core/SoarKernel/src/decision_process/rete.cpp
index 58c4a7b0e3..16c9a21378 100644
--- a/Core/SoarKernel/src/decision_process/rete.cpp
+++ b/Core/SoarKernel/src/decision_process/rete.cpp
@@ -5861,11 +5861,13 @@ void p_node_left_addition(agent* thisAgent, rete_node* node, token* tok, wme* w)
     {
         if (node->b.p.prod->already_fired)
         {
+            thisAgent->outputManager->printa_sf(thisAgent, "BUG_139:  Justification %y already fired, not firing again.\n", node->b.p.prod->name);
             return;
         }
         else
         {
             node->b.p.prod->already_fired = 1;
+            thisAgent->outputManager->printa_sf(thisAgent, "BUG_139:  Marking justification %y as fired.\n", node->b.p.prod->name);
         }
     }
 #endif
@@ -6126,7 +6128,7 @@ void p_node_left_addition(agent* thisAgent, rete_node* node, token* tok, wme* w)
             i need to talk to him about it. */
 
         }  /* end if (operator_proposal == false) */
-
+        thisAgent->outputManager->printa_sf(thisAgent, "rete: Production %y is %s-supported\n", node->b.p.prod->name, prod_type);
     }        /* end UNDECLARED_SUPPORT */
 
     if (prod_type == PE_PRODS)
diff --git a/Core/SoarKernel/src/soar_representation/instantiation.cpp b/Core/SoarKernel/src/soar_representation/instantiation.cpp
index d1a9c2ef1e..b1ff2806ee 100644
--- a/Core/SoarKernel/src/soar_representation/instantiation.cpp
+++ b/Core/SoarKernel/src/soar_representation/instantiation.cpp
@@ -673,6 +673,7 @@ void calculate_support_for_instantiation_preferences(agent* thisAgent, instantia
                 }
             }
         }
+        thisAgent->outputManager->printa_sf(thisAgent, "instantiation: Production %y is %s-supported\n", inst->prod_name, o_support ? "o" : "i");
     }
 
     if (o_support == true)
diff --git a/Core/SoarKernel/src/soar_representation/production.cpp b/Core/SoarKernel/src/soar_representation/production.cpp
index 2092ba32d8..22ccf73575 100644
--- a/Core/SoarKernel/src/soar_representation/production.cpp
+++ b/Core/SoarKernel/src/soar_representation/production.cpp
@@ -390,21 +390,9 @@ production* make_production(agent*          thisAgent,
     production* p;
     action* a;
 
-    if (type != JUSTIFICATION_PRODUCTION_TYPE)
+    for (a = *rhs_top; a != NIL; a = a->next)
     {
-        for (a = *rhs_top; a != NIL; a = a->next)
-        {
-            a->support = UNKNOWN_SUPPORT;
-        }
-    }
-    else
-    {
-        /* --- for justifications --- */
-        /* force run-time o-support (it'll only be done once) */
-        for (a = *rhs_top; a != NIL; a = a->next)
-        {
-            a->support = UNKNOWN_SUPPORT;
-        }
+        a->support = UNKNOWN_SUPPORT;
     }
 
     thisAgent->memoryManager->allocate_with_pool(MP_production, &p);