Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r72bca5d2e489fa253f3bdfdb254261a32c7a0c19 -re608f0a2bda2ad8df59a604a511cbd2a1c323dc3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 72bca5d2e489fa253f3bdfdb254261a32c7a0c19)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e608f0a2bda2ad8df59a604a511cbd2a1c323dc3)
@@ -4324,15 +4324,15 @@
  *************************************************************************/
 void handleTestDGNelsonDisinfectSupport( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    U32 payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( U32 ) );
 
-        NELSON_SUPPORT_T nelson = (NELSON_SUPPORT_T)payload.state.u32;
+        NELSON_SUPPORT_T nelson = (NELSON_SUPPORT_T)payload;
 
         switch( nelson )
         {
@@ -4347,12 +4347,12 @@
                 break;
 
             case NELSON_POS_CONTROL_CHEM_DISINFECT:
-                setNelsonSupportMode( nelson );
+                setChemNelsonSupportMode( nelson );
                 requestNewOperationMode( DG_MODE_CHEM );
                 break;
 
             case NELSON_CHEM_DISINFECT:
-                setNelsonSupportMode( nelson );
+                setChemNelsonSupportMode( nelson );
                 requestNewOperationMode( DG_MODE_CHEM );
                 break;