Index: trunk/BNC/RTCM/RTCM2.cpp
===================================================================
--- trunk/BNC/RTCM/RTCM2.cpp	(revision 226)
+++ trunk/BNC/RTCM/RTCM2.cpp	(revision 227)
@@ -29,6 +29,4 @@
 
 #include "RTCM2.h"
-
-#include "../bncutils.h"
 
 using namespace std;
@@ -995,4 +993,5 @@
 
   rng = rng_C1[i]; 
+  if (rng==0.0) rng = rng_P1[i];
   if (rng==0.0) return 0.0;
   
@@ -1014,4 +1013,5 @@
   
   rng = rng_C1[i]; 
+  if (rng==0.0) rng = rng_P1[i];
   if (rng==0.0) return 0.0;
   
@@ -1042,4 +1042,6 @@
 
 // ---------------- begin added by LM --------------------------------------
+
+#include "../bncutils.h"
 
 // Constructor
@@ -1091,5 +1093,5 @@
           obs->L1       = _ObsBlock.resolvedPhase_L1(iSat);
           obs->L2       = _ObsBlock.resolvedPhase_L2(iSat);
-        
+
           _obsList.push_back(obs);
         }
Index: trunk/BNC/RTCM/RTCM2.h
===================================================================
--- trunk/BNC/RTCM/RTCM2.h	(revision 226)
+++ trunk/BNC/RTCM/RTCM2.h	(revision 227)
@@ -331,5 +331,5 @@
     RTCM2();
     ~RTCM2();
-    void Decode(char* buffer = 0, int bufLen = 0);
+    virtual void Decode(char* buffer, int bufLen);
   private:
     std::string        _buffer;