Index: /branches/BNC_2.12/src/ephemeris.cpp
===================================================================
--- /branches/BNC_2.12/src/ephemeris.cpp	(revision 8217)
+++ /branches/BNC_2.12/src/ephemeris.cpp	(revision 8218)
@@ -729,6 +729,5 @@
 unsigned int t_ephGlo::isUnhealthy() const {
 
-  switch (_almanac_health_availablility_indicator) {
-    case 1:
+  if (_almanac_health_availablility_indicator) {
       if ((_health == 0 && _almanac_health == 0) ||
           (_health == 1 && _almanac_health == 0) ||
@@ -736,10 +735,9 @@
         return 1;
       }
-      break;
-    case 0:
-      if (_health) {
-        return 1;
-      }
-      break;
+  }
+  else if (!_almanac_health_availablility_indicator) {
+    if (_health) {
+      return 1;
+    }
   }
   return 0; /* (_health == 0 && _almanac_health == 1) or (_health == 0) */