diff --git a/master/_sources/lcls-twincat-motion_Library_source.rst.txt b/master/_sources/lcls-twincat-motion_Library_source.rst.txt
index b5c8f1e..00e17c1 100644
--- a/master/_sources/lcls-twincat-motion_Library_source.rst.txt
+++ b/master/_sources/lcls-twincat-motion_Library_source.rst.txt
@@ -6368,6 +6368,7 @@ FB_MotionBPTM
     // Only reset at safe beam OR at no bptm errors (some other FF should catch additional issues)
     ffBPTMTimeoutAndMove.i_xOK := NOT (bArbiterTimeout AND bMoveOnArbiterTimeout);
     ffBPTMTimeoutAndMove.i_xReset S= bResetBPTMTimeout OR (bptm.bDone AND NOT bptm.bError);
+    ffBPTMTimeoutAndMove.i_xReset R= NOT ffBPTMTimeoutAndMove.i_xOK;
     ffBPTMTimeoutAndMove(
         i_DevName := sDeviceName,
         i_Desc := 'BPTM Timeout',
@@ -6392,7 +6393,8 @@ FB_MotionBPTM
 
     // Trip the beam for BPTM Errors
     ffBPTMError.i_xOK := NOT bptm.bError;
-    ffBPTMError.i_xReset S= bptm.bDone AND NOT bptm.bError;
+    ffBPTMError.i_xReset S= bptm.bDone AND ffBPTMError.i_xOK;
+    ffBPTMError.i_xReset R= NOT ffBPTMError.i_xOK;
     ffBPTMError(
         i_DevName := sDeviceName,
         i_Desc := 'BPTM error, state transition failed',
diff --git a/master/lcls-twincat-motion_Library_source.html b/master/lcls-twincat-motion_Library_source.html
index ba3dcd5..105d078 100644
--- a/master/lcls-twincat-motion_Library_source.html
+++ b/master/lcls-twincat-motion_Library_source.html
@@ -6511,6 +6511,7 @@ <h2>FB_MotionBPTM<a class="headerlink" href="#fb-motionbptm" title="Link to this
 <span class="o">//</span> <span class="n">Only</span> <span class="n">reset</span> <span class="n">at</span> <span class="n">safe</span> <span class="n">beam</span> <span class="n">OR</span> <span class="n">at</span> <span class="n">no</span> <span class="n">bptm</span> <span class="n">errors</span> <span class="p">(</span><span class="n">some</span> <span class="n">other</span> <span class="n">FF</span> <span class="n">should</span> <span class="n">catch</span> <span class="n">additional</span> <span class="n">issues</span><span class="p">)</span>
 <span class="n">ffBPTMTimeoutAndMove</span><span class="o">.</span><span class="n">i_xOK</span> <span class="o">:=</span> <span class="n">NOT</span> <span class="p">(</span><span class="n">bArbiterTimeout</span> <span class="n">AND</span> <span class="n">bMoveOnArbiterTimeout</span><span class="p">);</span>
 <span class="n">ffBPTMTimeoutAndMove</span><span class="o">.</span><span class="n">i_xReset</span> <span class="n">S</span><span class="o">=</span> <span class="n">bResetBPTMTimeout</span> <span class="n">OR</span> <span class="p">(</span><span class="n">bptm</span><span class="o">.</span><span class="n">bDone</span> <span class="n">AND</span> <span class="n">NOT</span> <span class="n">bptm</span><span class="o">.</span><span class="n">bError</span><span class="p">);</span>
+<span class="n">ffBPTMTimeoutAndMove</span><span class="o">.</span><span class="n">i_xReset</span> <span class="n">R</span><span class="o">=</span> <span class="n">NOT</span> <span class="n">ffBPTMTimeoutAndMove</span><span class="o">.</span><span class="n">i_xOK</span><span class="p">;</span>
 <span class="n">ffBPTMTimeoutAndMove</span><span class="p">(</span>
     <span class="n">i_DevName</span> <span class="o">:=</span> <span class="n">sDeviceName</span><span class="p">,</span>
     <span class="n">i_Desc</span> <span class="o">:=</span> <span class="s1">&#39;BPTM Timeout&#39;</span><span class="p">,</span>
@@ -6535,7 +6536,8 @@ <h2>FB_MotionBPTM<a class="headerlink" href="#fb-motionbptm" title="Link to this
 
 <span class="o">//</span> <span class="n">Trip</span> <span class="n">the</span> <span class="n">beam</span> <span class="k">for</span> <span class="n">BPTM</span> <span class="n">Errors</span>
 <span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xOK</span> <span class="o">:=</span> <span class="n">NOT</span> <span class="n">bptm</span><span class="o">.</span><span class="n">bError</span><span class="p">;</span>
-<span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xReset</span> <span class="n">S</span><span class="o">=</span> <span class="n">bptm</span><span class="o">.</span><span class="n">bDone</span> <span class="n">AND</span> <span class="n">NOT</span> <span class="n">bptm</span><span class="o">.</span><span class="n">bError</span><span class="p">;</span>
+<span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xReset</span> <span class="n">S</span><span class="o">=</span> <span class="n">bptm</span><span class="o">.</span><span class="n">bDone</span> <span class="n">AND</span> <span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xOK</span><span class="p">;</span>
+<span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xReset</span> <span class="n">R</span><span class="o">=</span> <span class="n">NOT</span> <span class="n">ffBPTMError</span><span class="o">.</span><span class="n">i_xOK</span><span class="p">;</span>
 <span class="n">ffBPTMError</span><span class="p">(</span>
     <span class="n">i_DevName</span> <span class="o">:=</span> <span class="n">sDeviceName</span><span class="p">,</span>
     <span class="n">i_Desc</span> <span class="o">:=</span> <span class="s1">&#39;BPTM error, state transition failed&#39;</span><span class="p">,</span>