Index: /trunk/clock_and_orbit/lib/clock_orbit_rtcm.c
===================================================================
--- /trunk/clock_and_orbit/lib/clock_orbit_rtcm.c	(revision 7776)
+++ /trunk/clock_and_orbit/lib/clock_orbit_rtcm.c	(revision 7777)
@@ -587,5 +587,5 @@
       T_DISPERSIVE_BIAS_INDICATOR(b->DispersiveBiasConsistencyIndicator ? 1 : 0)
       T_MW_CONSISTENCY_INDICATOR(b->MWConsistencyIndicator ? 1 : 0)
-      T_NO_OF_SATELLITES(b->NumberOfSat[CLOCKORBIT_SATGPS])
+      T_NO_OF_SATELLITES(b->NumberOfSat[s])
       for(i = satoffset[s]; i < satoffset[s]+b->NumberOfSat[s]; ++i)
       {
@@ -603,5 +603,5 @@
           break;
         }
-        T_NO_OF_CODE_BIASES(b->Sat[i].NumberOfPhaseBiases)
+        T_NO_OF_PHASE_BIASES(b->Sat[i].NumberOfPhaseBiases)
         T_YAW_ANGLE(b->Sat[i].YawAngle)
         T_YAW_RATE(b->Sat[i].YawRate)