Index: /trunk/BNC/combination/bnccomb.cpp
===================================================================
--- /trunk/BNC/combination/bnccomb.cpp	(revision 3455)
+++ /trunk/BNC/combination/bnccomb.cpp	(revision 3456)
@@ -393,5 +393,8 @@
   // If Master not present, switch to another one
   // --------------------------------------------
-  if (!masterPresent) {
+  if (masterPresent) {
+    _masterMissingEpochs = 0;
+  }
+  else {
     ++_masterMissingEpochs;
     if (_masterMissingEpochs < 2) {