diff --git a/LSL2/STPROC/WO_MAT_ACTIONS.txt b/LSL2/STPROC/WO_MAT_ACTIONS.txt
index 1791ed5..3a18e98 100644
--- a/LSL2/STPROC/WO_MAT_ACTIONS.txt
+++ b/LSL2/STPROC/WO_MAT_ACTIONS.txt
@@ -573,15 +573,16 @@ return
 
 
 WRITE_RECORD:
-    
-    WONo          = Field(Name, '*', 1)
-    CassNo        = Field(Name, '*', 2)
-    WOMatKeyID    = Name
+
+    WONo       = Field(Name, '*', 1)
+    CassNo     = Field(Name, '*', 2)
+    WOMatKeyID = Name
     
     If {REACTOR_TYPE} NE 'EPP' then
         If {MAKEUP_BOX} then
-            CurrWaferCount  = obj_WO_Mat('CurrWaferCnt', WOMatKeyID)
-            If CurrWaferCount GT 0 then
+            CurrWaferCount = obj_WO_Mat('CurrWaferCnt', WOMatKeyID)
+            CurrStatus     = {CURR_STATUS}
+            If ( (CurrWaferCount GT 0) and (CurrStatus NE 'VOID') ) then
                 // Populate MAKEUP_WAFERS table
                 // Add/update cassette data to the MAKEUP_WAFERS table
                 If RowExists('MAKEUP_WAFERS', WOMatKeyID) then
@@ -600,7 +601,7 @@ WRITE_RECORD:
                 MUWfrRec<MAKEUP_WAFERS.PROD_VER_NO$>        = {PROD_VER_NO}
                 MUWfrRec<MAKEUP_WAFERS.CUST_PART_NO$>       = {CUST_PART_NO}
                 MUWfrRec<MAKEUP_WAFERS.REACT_TYPE$>         = {REACTOR_TYPE}
-                MUWfrRec<MAKEUP_WAFERS.CURR_STATUS_STATIC$> = {CURR_STATUS}
+                MUWfrRec<MAKEUP_WAFERS.CURR_STATUS_STATIC$> = CurrStatus
                 MUWfrRec<MAKEUP_WAFERS.WFR_QTY$>            = CurrWaferCount
                 DateOut                                     = Xlate('RDS', {RDS_NO}, 'DATE_OUT', 'X')
                 TimeOut                                     = Xlate('RDS', {RDS_NO}, 'TIME_OUT', 'X') / 86400