diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 9d6ddc71..32aaaa21 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -909,11 +909,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                     if (!string.IsNullOrEmpty(call.Status.Value))
                                     {
                                         tempActiveCall.Status = CodecCallStatus.ConvertToStatusEnum(call.Status.Value);
-                                        if (tempActiveCall.Status == eCodecCallStatus.OnHold)
-                                        {
-                                            tempActiveCall.IsOnHold = true;
-                                        }
-
+                                        tempActiveCall.IsOnHold = tempActiveCall.Status == eCodecCallStatus.OnHold;
+   
                                         if (newStatus == eCodecCallStatus.Connected)
                                             GetCallHistory();
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 0d1df28f..07c62144 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs	
@@ -1270,7 +1270,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 		{
 			const int maxCalls = 8;
 			const int maxStrings = 6;
-			const int offset = 6;
+            const int maxDigitals = 2;
+			const int offset = maxStrings + maxDigitals;
 			var stringIndex = 0;
 			var digitalIndex = maxStrings * maxCalls;
 			var arrayIndex = 0;
@@ -1282,8 +1283,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				if (arrayIndex >= maxCalls * offset)
 					break;
 				//digitals
-				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);
-                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, call.IsOnHold);
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, call.IsActiveCall);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, call.IsOnHold);
 
 				//serials
 				tokenArray[arrayIndex + 1] = new XSigSerialToken(stringIndex + 1, call.Name ?? String.Empty);
@@ -1305,8 +1306,8 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 			while (digitalIndex < maxCalls)
 			{
 				//digitals
-				tokenArray[arrayIndex] = new XSigDigitalToken(digitalIndex + 1, false);
-                tokenArray[arrayIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
+                tokenArray[digitalIndex] = new XSigDigitalToken(digitalIndex + 1, false);
+                tokenArray[digitalIndex + 1] = new XSigDigitalToken(digitalIndex + 2, false);
 
 
                 //serials