Index: trunk/BNC/src/bncephuser.cpp
===================================================================
--- trunk/BNC/src/bncephuser.cpp	(revision 9487)
+++ trunk/BNC/src/bncephuser.cpp	(revision 9488)
@@ -157,7 +157,6 @@
   }
 
-  if ( (ephOld == 0) || newEph->isNewerThan(ephOld)) {
-    checkEphemeris(newEph, realTime);
-    eph->setCheckState(newEph->checkState());
+  if ( (ephOld == 0) || eph->isNewerThan(ephOld)) {
+    checkEphemeris(eph, realTime);
   }
   else {
@@ -166,7 +165,8 @@
   }
 
-  if (newEph->checkState() != t_eph::bad &&
-      newEph->checkState() != t_eph::outdated) {
+  if (eph->checkState() != t_eph::bad &&
+      eph->checkState() != t_eph::outdated) {
     deque<t_eph*>& qq = _eph[prn];
+    newEph->setCheckState(eph->checkState());
     qq.push_back(newEph);
     if (qq.size() > _maxQueueSize) {
Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9487)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9488)
@@ -473,4 +473,5 @@
       }
     }
+
     if (eph &&
         !outDatedBcep(eph)                    &&  // detected from storage because of no update