Index: /trunk/rtcm3torinex/lib/rtcm3torinex.c
===================================================================
--- /trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 2667)
+++ /trunk/rtcm3torinex/lib/rtcm3torinex.c	(revision 2668)
@@ -955,5 +955,5 @@
         };
 
-        int sys = RTCM3_MSM_GPS, i, count, j, old = 0, wasamb = 0;
+        int sys = RTCM3_MSM_GPS, i, count, j, old = 0, wasnoamb = 0;
         int syncf, sigmask, numsat = 0, numsig = 0, numcells;
         uint64_t satmask, cellmask, ui;
@@ -1017,5 +1017,5 @@
         {
         case 1: case 2: case 3:
-          ++wasamb;
+          ++wasnoamb;
           for(j = numsat; j--;)
             GETFLOAT(rrmod[j], 10, 1/1024.0)
@@ -1184,5 +1184,5 @@
                   {
                     gnss->measdata[num][cd.typeR] = psr[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0;
                     gnss->dataflags[num] |= (1<<cd.typeR);
                   }
@@ -1192,5 +1192,5 @@
                   {
                     gnss->measdata[num][cd.typeP] = cp[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0/wl;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0/wl;
                     if(handle->lastlockmsm[j][i] != ll[count])
                     {
@@ -1205,5 +1205,5 @@
                   {
                     gnss->measdata[num][cd.typeR] = psr[count]
-                    +(rrmod[numsat]+rrint[numsat])*LIGHTSPEED/1000.0;
+                    +(rrmod[numsat])*LIGHTSPEED/1000.0;
                     gnss->dataflags[num] |= (1<<cd.typeR);
                   }
@@ -1337,5 +1337,5 @@
         if(!syncf || old)
         {
-          if(wasamb) /* not RINEX compatible without */
+          if(!wasnoamb) /* not RINEX compatible without */
             ret = 1;
           else