diff --git a/src/services/galaxy/travel/TravelGroup.java b/src/services/galaxy/travel/TravelGroup.java
index 21959c4fb..34d1dcee0 100644
--- a/src/services/galaxy/travel/TravelGroup.java
+++ b/src/services/galaxy/travel/TravelGroup.java
@@ -60,7 +60,8 @@ public class TravelGroup implements Runnable {
 		this.landTime = landTime + 10000;
 		this.groundTime = groundTime;
 		this.airTime = airTime;
-		this.starport = template.endsWith("shared_player_transport.iff");
+		String [] folders = template.split("/");
+		this.starport = folders[folders.length - 1].startsWith("shared_player_transport");
 		this.status = ShuttleStatus.GROUNDED;
 	}
 	
diff --git a/src/services/galaxy/travel/TravelService.java b/src/services/galaxy/travel/TravelService.java
index 41c65c31f..811378fae 100644
--- a/src/services/galaxy/travel/TravelService.java
+++ b/src/services/galaxy/travel/TravelService.java
@@ -238,7 +238,7 @@ public class TravelService extends Service {
 		double z = set.getDouble("z");
 		String type = set.getString("type");
 		
-		TravelPoint point = new TravelPoint(pointName, new Location(x, y, z, travelPlanet), type.equals("starport"), true);
+		TravelPoint point = new TravelPoint(pointName, new Location(x, y, z, travelPlanet), type.endsWith("starport"), true);
 		switch (type) {
 			case "shuttleport":
 				travel.get("object/creature/npc/theme_park/shared_player_shuttle.iff").addTravelPoint(point);