diff --git a/LSL2/STPROC/NCR_ACTIONS.txt b/LSL2/STPROC/NCR_ACTIONS.txt
index 0d3c6e8..dee9b79 100644
--- a/LSL2/STPROC/NCR_ACTIONS.txt
+++ b/LSL2/STPROC/NCR_ACTIONS.txt
@@ -711,6 +711,7 @@ return
 
 DELETE_RECORD:
 	
+	NCRNo    = Name   
 	WorkOrderNo = {WO_NO}
 	CassNo      = {WO_MAT_CASS_NO}
 	WoMatKey    = WorkOrderNo : '*' : CassNo
@@ -736,7 +737,6 @@ DELETE_RECORD:
 	
 	SAPBatchNo = Xlate('WO_MAT', WOMatKey, 'SAP_BATCH_NO', 'X')
 	If SAPBatchNo NE '' then
-		NCRNo    = Name        
 		TransQty = Sum(obj_NCR('RejQty',NCRNo:@RM:Record))
 		TransQty = TransQty * '-1'
 		
diff --git a/LSL2/STPROC/NCR_SERVICES.txt b/LSL2/STPROC/NCR_SERVICES.txt
index a56f685..90ca102 100644
--- a/LSL2/STPROC/NCR_SERVICES.txt
+++ b/LSL2/STPROC/NCR_SERVICES.txt
@@ -134,8 +134,8 @@ Service ProcessScanData(ScanData, ScanType = SCAN_TYPES, FirstCassID, OperatorID
                             Convert '.' to '*' in CassetteID
                             ValidcassID = RowExists('WM_IN', CassetteID) or RowExists('WM_OUT', CassetteID)
                         Case RDSCass
-                            RDSRow    = Database_Services('ReadDataRow', 'RDS', CassetteID)
-                            ValidCass = RowExists('RDS', CassetteID)
+                            RDSRow      = Database_Services('ReadDataRow', 'RDS', CassetteID)
+                            ValidcassID = RowExists('RDS', CassetteID)
                     End Case
                     
                     If ( (Seq1 EQ 'SEQ1') or (Seq1 EQ 'SEQ2') ) then
@@ -559,3 +559,4 @@ Service ConvertRecordToJson(NCRId)
     
 end service
 
+