diff --git a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
index 33639b9..f386a77 100644
--- a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
+++ b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
@@ -395,7 +395,7 @@ Service SetReasonForReturn(RTFId, UserId, Reason)
     If RTFId NE '' then
         If RowExists('RETURN_TO_FAB_LOTS', RTFId) then
             RTFCurrStep       = Return_To_Fab_Services('GetRTFCurrStep', RTFId)
-            If RTFCurrStep EQ LE 3 AND RTFCurrStep GE 1 then
+            If RTFCurrStep LE 3 AND RTFCurrStep GE 1 then
                 RTFRecord         = Database_Services('ReadDataRow', 'RETURN_TO_FAB_LOTS', RTFId, True$, 0, False$)
                 RTFRecordComplete = RTFRecord<RETURN_TO_FAB_LOTS_COMPLETED$>
                 If RTFRecordComplete NE True$ then
@@ -594,7 +594,7 @@ Service SetEvalInfo(RTFId, EvalUserId, ResultId)
     If RTFId NE '' then
         if RowExists('RETURN_TO_FAB_LOTS', RTFId) then
             RTFCurrStep       = Return_To_Fab_Services('GetRTFCurrStep', RTFId)
-            If RTFCurrStep EQ 4 AND RTFCurrStep LE 5 then
+            If RTFCurrStep EQ 4 OR RTFCurrStep EQ 5 then
                 If EvalUserId NE '' then
                     if RowExists('LSL_USERS', EvalUserId) then
                         If ResultId NE '' then