diff --git a/api/data/NMBS/stations.php b/api/data/NMBS/stations.php
index ee84c432..2aefe691 100644
--- a/api/data/NMBS/stations.php
+++ b/api/data/NMBS/stations.php
@@ -52,6 +52,7 @@ public static function getStationFromID($id, $lang){
 	  if(sizeof($idarray) > 0){
 		$id=$idarray[2];
 	  }
+          $id = "BE.NMBS." . $id;
 	  $station;
 	  try {
 	       $lang = mysql_real_escape_string(strtoupper($lang));
@@ -83,9 +84,9 @@ public static function getStationFromID($id, $lang){
       */
      public static function getStationFromName($name, $lang){
           //first check if it wasn't by any chance an id
-          if(substr($name,0,1) === "0" || substr($name,0,4) === "NMBS"){
-              $id=$name;
-              $idarray = explode(".",$id);              
+          if(substr($name,0,1) === "0" || substr($name,0,6) === "BE.NMBS"){
+              $id = $name;
+              $idarray = explode(".",$id);
               if(sizeof($idarray) > 0){
                   $id=$idarray[2];
               }