diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index 91575956..ff49e2aa 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -1394,6 +1394,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return 'I';
 		if ("EM".equals(ucType)) // Euromed, Barcelona-Alicante, Spanien
 			return 'I';
+		if ("A".equals(ucType)) // Spain, Highspeed
+			return 'I';
 		if ("AVE".equals(ucType)) // Alta Velocidad Española, Spanien
 			return 'I';
 		if ("ARC".equals(ucType)) // Arco (Renfe), Spanien
@@ -1785,6 +1787,7 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 
 	protected static final Pattern P_NORMALIZE_LINE_AND_TYPE = Pattern.compile("([^#]*)#(.*)");
 	private static final Pattern P_NORMALIZE_LINE_NUMBER = Pattern.compile("\\d{2,5}");
+
 	// saved from RtProvider
 	// private static final Pattern P_NORMALIZE_LINE_RUSSIA = Pattern.compile("(\\d{3}(BJ|FJ|IJ|MJ|NJ|OJ|TJ|SZ))");
 
diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index febfece1..2e69455a 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -546,9 +546,6 @@ public final class BahnProvider extends AbstractHafasProvider
 	{
 		final String ucType = type.toUpperCase();
 
-		if ("A".equals(ucType)) // Spain, Highspeed
-			return 'I';
-
 		if ("RNV".equals(ucType))
 			return 'R';
 		if ("DZ".equals(ucType)) // Dampfzug