Index: trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/src/combination/bnccomb.cpp	(revision 10311)
+++ trunk/BNC/src/combination/bnccomb.cpp	(revision 10330)
@@ -638,5 +638,6 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncComb::processEpoch(bncTime epoTime, const vector<t_clkCorr>& clkCorrVec) {
-
+  QDateTime now = currentDateAndTimeGPS();
+  bncTime   currentTime(now.toString(Qt::ISODate).toStdString());
   for (unsigned ii = 0; ii < clkCorrVec.size(); ii++) {
     const t_clkCorr& clkCorr = clkCorrVec[ii];
@@ -698,5 +699,6 @@
       continue;
     }
-    else if (ephLast->checkState() == t_eph::bad ||
+    else if (outDatedBcep(ephLast, currentTime)  ||
+             ephLast->checkState() == t_eph::bad ||
              ephLast->checkState() == t_eph::outdated ||
              ephLast->checkState() == t_eph::unhealthy) {
@@ -711,5 +713,7 @@
         _newCorr->_eph = ephLast;
       }
-      else if (ephPrev && ephPrev->checkState() == t_eph::ok &&
+      else if (ephPrev &&
+               !outDatedBcep(ephPrev, currentTime) &&  // if not updated in storage
+               ephPrev->checkState() == t_eph::ok  &&  // received
                ephPrev->IOD() == _newCorr->_iod) {
         _newCorr->_eph = ephPrev;
