diff --git a/core/lib/FileHandling/SP3/SP3Header.cpp b/core/lib/FileHandling/SP3/SP3Header.cpp
index f0967f327..0b8a05f1a 100644
--- a/core/lib/FileHandling/SP3/SP3Header.cpp
+++ b/core/lib/FileHandling/SP3/SP3Header.cpp
@@ -170,7 +170,7 @@ namespace gpstk
              }
              else
              {
-                FFStreamError e("Unknown 1st char in line " + asString(i) + ": "
+                FFStreamError e("Unknown 1st char in line " + asString(lineCount) + ": "
                    + string(1, line[0]));
                 GPSTK_THROW(e);
              }
diff --git a/core/lib/GNSSEph/BDSEphemeris.cpp b/core/lib/GNSSEph/BDSEphemeris.cpp
index 23fc0982f..0b85d12c9 100644
--- a/core/lib/GNSSEph/BDSEphemeris.cpp
+++ b/core/lib/GNSSEph/BDSEphemeris.cpp
@@ -160,7 +160,7 @@ namespace gpstk
          // If the PRN ID is greatet than 5, assume this
          // is a MEO or IGSO SV and use the standard OrbitEph
          // version of svXvt
-      if (satID.id>5) return(OrbitEph::svXvt(t));
+      if (satID.id>5 && satID.id != 59) return(OrbitEph::svXvt(t));
 
          // If PRN ID is in the range 1-5, treat this as a GEO
          // 
diff --git a/core/lib/GNSSEph/OrbitEphStore.cpp b/core/lib/GNSSEph/OrbitEphStore.cpp
index a5c58f54a..21fce3367 100644
--- a/core/lib/GNSSEph/OrbitEphStore.cpp
+++ b/core/lib/GNSSEph/OrbitEphStore.cpp
@@ -53,6 +53,7 @@
 #include "RinexSatID.hpp"  // for dump
 
 #include "OrbitEphStore.hpp"
+#include "BDSEphemeris.hpp"
 
 using namespace std;
 using namespace gpstk::StringUtils;
@@ -73,8 +74,24 @@ namespace gpstk
          if(onlyHealthy && !eph->isHealthy())
             GPSTK_THROW(InvalidRequest("Not healthy"));
 
-         // compute the position, velocity and time
-         Xvt sv = eph->svXvt(t);
+          Xvt sv;
+          const BDSEphemeris *bdsEph = NULL;
+          // compute the position, velocity and time
+          switch (eph->satID.system)
+          {
+             // BDS: Prn 1~5 and 59 satellites in BDS are GEO type. 
+             // Special treatments are needed.
+             // ref. http://www.csno-tarc.cn/system/constellation&ce=english
+          case SatID::systemBeiDou:
+             bdsEph = dynamic_cast<const BDSEphemeris *>(eph);
+             sv = bdsEph->svXvt(t);
+             break;
+             // GPS, GAL, QZSS 
+          default:
+             sv = eph->svXvt(t);
+             break;
+          }
+
          return sv;
       }
       catch(InvalidRequest& ir) { GPSTK_RETHROW(ir); }