diff --git a/src/TLC59731Analyzer.cpp b/src/TLC59731Analyzer.cpp
index 021226b..c47f643 100644
--- a/src/TLC59731Analyzer.cpp
+++ b/src/TLC59731Analyzer.cpp
@@ -2,6 +2,7 @@
 #include "TLC59731AnalyzerSettings.h"
 #include <AnalyzerChannelData.h>
 #include <AnalyzerResults.h>
+#include <LogicPublicTypes.h>
 
 TLC59731Analyzer::TLC59731Analyzer() : Analyzer2(), mSettings(), mSimulationInitilized( false )
 {
@@ -28,7 +29,7 @@ void TLC59731Analyzer::WorkerThread()
 
     mSerial = GetAnalyzerChannelData( mSettings.mInputChannel );
 
-    while( SamplesToNS( mSerial->GetSampleOfNextEdge() - mSerial->GetSampleNumber() ) < TLL_MIN )
+    while( SamplesToNS( mSerial->GetSampleOfNextEdge() - mSerial->GetSampleNumber() ) < TLL_MIN || mSerial->GetBitState() == BIT_HIGH )
     {
         mSerial->AdvanceToNextEdge();
     }
@@ -53,7 +54,7 @@ void TLC59731Analyzer::WorkerThread()
     while( 1 )
     {
         mSerial->AdvanceToNextEdge(); // falling edge
-        if( SamplesToNS( mSerial->GetSampleOfNextEdge() - SoB ) < cycleTime / 2 )
+        if( SamplesToNS( mSerial->GetSampleOfNextEdge() - SoB ) < cycleTime / 2.0 + 1000 )
         {
             // 1
             data <<= 1;