diff --git a/LSL2/STPROC/COMM_RDS.txt b/LSL2/STPROC/COMM_RDS.txt
index d65a510..adc979c 100644
--- a/LSL2/STPROC/COMM_RDS.txt
+++ b/LSL2/STPROC/COMM_RDS.txt
@@ -2053,7 +2053,6 @@ HoldClick:
 * * * * * * *
     
     RDSNo		= Get_Property(@WINDOW:'.RDS_NO','DEFPROP')
-    WOMatKey	= Get_Property(@WINDOW:'.WO_MAT_KEY','DEFPROP')
     CtrlEnt		= Get_Property(@WINDOW,'FOCUS')
     
     Send_Event(@WINDOW,'WRITE')
@@ -2061,7 +2060,7 @@ HoldClick:
     IF RDSNo NE '' then
 		HoldEntity		= 'RDS'
 		HoldEntityID	= RDSNo
-		
+		WOMatKey = Xlate('RDS', RDSNo, 'WO_MAT_KEY', 'X', '')
 		//obj_WO_Mat('ToggleHold',WOMatKey:@RM:HoldEntity:@RM:HoldEntityID:@RM:CtrlEnt)
 		Transition = Hold_Services('CheckForHold', WOMatKey, CtrlEnt)
 		HoldType   = 'HOLD'
diff --git a/LSL2/STPROC/COMM_WM_IN.txt b/LSL2/STPROC/COMM_WM_IN.txt
index d092a48..dc289e5 100644
--- a/LSL2/STPROC/COMM_WM_IN.txt
+++ b/LSL2/STPROC/COMM_WM_IN.txt
@@ -728,6 +728,7 @@ RETURN
 HoldClick:
 * * * * * * *
 
+CtrlEntID = @WINDOW
 WMInKey = Get_Property(@WINDOW,'ID')
 
 WONo	= WMInKey[1,'*']
@@ -748,7 +749,7 @@ Send_Event(@WINDOW,'WRITE')
     HoldData   = ''
     HoldData   = Dialog_Box('DIALOG_HOLD',@WINDOW,Transition:@FM:@FM:HoldType)
     If HoldData NE 'Cancel' then
-		Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEnt, '', HoldData)
+		Hold_Services('ToggleHold', WOMatKey, HoldEntity, HoldEntityID, CtrlEntID, '', HoldData)
 		IF Error_Services("HasError") THEN
 			ErrCode = Error_Services("GetMessage")
 			ErrMsg(errCode)