diff --git a/modules/ThreeSixtySpatialtoTemporal.cpp b/modules/ThreeSixtySpatialtoTemporal.cpp
index 4fd6842..38370e0 100644
--- a/modules/ThreeSixtySpatialtoTemporal.cpp
+++ b/modules/ThreeSixtySpatialtoTemporal.cpp
@@ -52,7 +52,7 @@ bool ThreeSixtySpatialtoTemporal::flush()
 
 bool ThreeSixtySpatialtoTemporal::needFrame()
 {
-  if( m_iFrameBufferCount == 0 )
+  if( m_iFrameBufferCount <= 0 )
   {
     return true;
   }
@@ -70,7 +70,7 @@ bool ThreeSixtySpatialtoTemporal::create( std::vector<CalypFrame*> apcFrameList
   iHeight = apcFrameList[0]->getHeight() / m_uiFacesY;
 
   m_pcOutputFrame = new CalypFrame( iWidth, iHeight, apcFrameList[0]->getPelFormat(),
-                                       apcFrameList[0]->getBitsPel() );
+                                    apcFrameList[0]->getBitsPel() );
 
   m_pcTmpFrame = new CalypFrame( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), apcFrameList[0]->getPelFormat(),
                                  apcFrameList[0]->getBitsPel() );
diff --git a/tools/CalypTools.cpp b/tools/CalypTools.cpp
index b3724b7..fc679aa 100644
--- a/tools/CalypTools.cpp
+++ b/tools/CalypTools.cpp
@@ -573,13 +573,9 @@ int CalypTools::ModuleOperation()
     apcFrameList.push_back( m_apcInputStreams[i]->getCurrFrame() );
   }
 
-  for( unsigned int frame = 0; frame < m_uiNumberOfFrames; frame++ )
+  for( unsigned int frame = 0; frame < m_uiNumberOfFrames; )
   {
     bool bReadFrame = true;
-    if( apcFrameList.size() == 0 )
-    {
-      break;
-    }
     if( m_pcCurrModuleIf->m_iModuleType == CLP_FRAME_PROCESSING_MODULE )
     {
       if( m_pcCurrModuleIf->m_iModuleAPI >= CLP_MODULE_API_2 )
@@ -607,7 +603,10 @@ int CalypTools::ModuleOperation()
       bReadFrame = m_pcCurrModuleIf->needFrame();
     }
     if( bReadFrame )
+    {
       apcFrameList = readInput();
+      frame++;
+    }
   }
 
   if( m_pcCurrModuleIf->m_iModuleAPI >= CLP_MODULE_API_3 )