diff --git a/apps/ndn-consumer-pcon.cpp b/apps/ndn-consumer-pcon.cpp
index 22427407c..3dfece56b 100644
--- a/apps/ndn-consumer-pcon.cpp
+++ b/apps/ndn-consumer-pcon.cpp
@@ -126,9 +126,7 @@ ConsumerPcon::OnData(shared_ptr<const Data> data)
     WindowIncrease();
   }
 
-  if (m_inFlight > static_cast<uint32_t>(0)) {
-    m_inFlight--;
-  }
+  m_inFlight = m_seqTimeouts.size();
 
   NS_LOG_DEBUG("Window: " << m_window << ", InFlight: " << m_inFlight);
 
@@ -140,9 +138,7 @@ ConsumerPcon::OnTimeout(uint32_t sequenceNum)
 {
   WindowDecrease();
 
-  if (m_inFlight > static_cast<uint32_t>(0)) {
-    m_inFlight--;
-  }
+  m_inFlight = m_seqTimeouts.size();
 
   NS_LOG_DEBUG("Window: " << m_window << ", InFlight: " << m_inFlight);
 
diff --git a/apps/ndn-consumer-window.cpp b/apps/ndn-consumer-window.cpp
index 79c31e2a5..072991341 100644
--- a/apps/ndn-consumer-window.cpp
+++ b/apps/ndn-consumer-window.cpp
@@ -199,8 +199,7 @@ ConsumerWindow::OnData(shared_ptr<const Data> contentObject)
 void
 ConsumerWindow::OnTimeout(uint32_t sequenceNumber)
 {
-  if (m_inFlight > static_cast<uint32_t>(0))
-    m_inFlight--;
+  m_inFlight = m_seqTimeouts.size();
 
   if (m_setInitialWindowOnTimeout) {
     // m_window = std::max<uint32_t> (0, m_window - 1);
@@ -214,8 +213,8 @@ ConsumerWindow::OnTimeout(uint32_t sequenceNumber)
 void
 ConsumerWindow::WillSendOutInterest(uint32_t sequenceNumber)
 {
-  m_inFlight++;
   Consumer::WillSendOutInterest(sequenceNumber);
+  m_inFlight = m_seqTimeouts.size();
 }
 
 } // namespace ndn