diff --git a/src/main.cpp b/src/main.cpp
index 228f0abcb..3aed7fd53 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2888,7 +2888,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
     if ( KOMODO_REWIND != 0 )
     {
         fprintf(stderr,"rewind start ht.%d\n",chainActive.Tip()->nHeight);
-        while ( chainActive.Tip()->nHeight > KOMODO_REWIND )
+        while ( KOMODO_REWIND > 0 && chainActive.Tip()->nHeight > KOMODO_REWIND )
         {
             if ( !DisconnectTip(state) )
             {
@@ -2897,7 +2897,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
             }
         }
         fprintf(stderr,"reached rewind.%d, best to do: ./komodo-cli stop\n",KOMODO_REWIND);
-        sleep(3600);
+        sleep(60);
         KOMODO_REWIND = 0;
         return(true);
     }