Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r6c6ac1c4b4da92566ad645e0b54ec6db20d78f93 -r79a50fd7478f2becd4bb79cb9743e34debfe5d62
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 6c6ac1c4b4da92566ad645e0b54ec6db20d78f93)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 79a50fd7478f2becd4bb79cb9743e34debfe5d62)
@@ -502,9 +502,9 @@
 
         data.d17Cond        = getFilteredConductivity( D17_COND );
         data.d27Cond        = getFilteredConductivity( D27_COND );
-        data.d29Cond        = getFilteredConductivity( D29_COND );
+        data.d29Cond        = getConductivity( D17_COND );
         data.d43Cond        = getFilteredConductivity( D43_COND );
-        data.d74Cond        = getFilteredConductivity( D74_COND );
+        data.d74Cond        = getConductivity( D27_COND );
         ddConductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_CONDUCTIVITY_DATA_T ) );
@@ -515,7 +515,7 @@
     {
         FP_CONDUCTIVITY_DATA_T data;
 
-        data.p9Conductivity     = getFilteredConductivity( P9_COND );
+        data.p9Conductivity     = getConductivity( D43_COND );
         data.p18Conductivity    = getFilteredConductivity( P18_COND );
         fpConductivityPublishTimerCounter = 0;