diff --git a/src/cpp/ripple/RippleCalc.cpp b/src/cpp/ripple/RippleCalc.cpp
index f6b575523d..f01f72cbf3 100644
--- a/src/cpp/ripple/RippleCalc.cpp
+++ b/src/cpp/ripple/RippleCalc.cpp
@@ -1800,7 +1800,7 @@ void RippleCalc::calcNodeRipple (
                                    % saPrvAct
                                    % saCurAct);
 
-    assert (saCurReq.isPositive ());
+    assert (saCurReq.isPositive ()); // FIXME: saCurReq was zero
     assert (saPrvReq.getCurrency () == saCurReq.getCurrency ());
     assert (saPrvReq.getCurrency () == saPrvAct.getCurrency ());
     assert (saPrvReq.getIssuer () == saPrvAct.getIssuer ());
@@ -2425,7 +2425,8 @@ TER RippleCalc::calcNodeAccountFwd (
 
             // Previous issue part 2 : issue -> issue
             if (saPrvIssueReq != saPrvIssueAct              // Previous wants to issue.
-                    && saCurRedeemReq == saCurRedeemAct)        // Current redeeming is done can issue.
+                    && saCurRedeemReq == saCurRedeemAct        // Current redeeming is done can issue.
+                    && saCurIssueReq)                           // Current wants to issue.
             {
                 // Rate: quality in : 1.0
                 calcNodeRipple (uQualityIn, QUALITY_ONE, saPrvIssueReq, saCurIssueReq, saPrvIssueAct, saCurIssueAct, uRateMax);