diff --git a/src/de/schildbach/pte/BvgProvider.java b/src/de/schildbach/pte/BvgProvider.java
index e1f275f2..b31732ab 100644
--- a/src/de/schildbach/pte/BvgProvider.java
+++ b/src/de/schildbach/pte/BvgProvider.java
@@ -440,7 +440,7 @@ public final class BvgProvider extends AbstractHafasProvider
 
 	private static final Pattern P_CONNECTION_DETAILS_HEAD = Pattern.compile(".*(?:Datum|Abfahrt): (\\d\\d\\.\\d\\d\\.\\d\\d).*", Pattern.DOTALL);
 	private static final Pattern P_CONNECTION_DETAILS_COARSE = Pattern.compile("<p class=\"con\\w\">\n(.+?)</p>", Pattern.DOTALL);
-	static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:<a href=\".*?input=(\\d+).*?\">(?:\n<strong>)?" // departureId
+	static final Pattern P_CONNECTION_DETAILS_FINE = Pattern.compile("(?:<a href=\"/Fahrinfo[^\"]*input=(\\d+)\">(?:\n<strong>)?" // departureId
 			+ "(.+?)(?:</strong>\n)?</a>)?.*?" // departure
 			+ "(?:" //
 			+ "ab (\\d+:\\d+)\n" // departureTime
@@ -449,14 +449,14 @@ public final class BvgProvider extends AbstractHafasProvider
 			+ "Ri\\. (.*?)[\n\\.]*<.*?" // destination
 			+ "an (\\d+:\\d+)\n" // arrivalTime
 			+ "(Gl\\. \\d+)?.*?" // arrivalPosition
-			+ "<a href=\".*?input=(\\d+).*?\">\n" // arrivalId
-			+ "<strong>(.*?)</strong>" // arrival
+			+ "<a href=\"/Fahrinfo[^\"]*input=(\\d+)\">\n" // arrivalId
+			+ "<strong>([^<]*)</strong>" // arrival
 			+ "|" //
 			+ "(\\d+) Min\\.\n" // footway
 			+ "(?:Fussweg|&#220;bergang)\n" //
 			+ "<br />\n" //
-			+ "(?:<a href=\"/Fahrinfo.*?input=(\\d+)\">\n" // arrivalId
-			+ "<strong>(.*?)</strong>|<a href=\"/Stadtplan.*?WGS84,(\\d+),(\\d+)&.*?\">([^<]*)</a>|<strong>([^<]*)</strong>).*?" // arrival
+			+ "(?:<a href=\"/Fahrinfo[^\"]*input=(\\d+)\">\n" // arrivalId
+			+ "<strong>([^<]*)</strong>|<a href=\"/Stadtplan.*?WGS84,(\\d+),(\\d+)&.*?\">([^<]*)</a>|<strong>([^<]*)</strong>).*?" // arrival
 			+ ").*?", Pattern.DOTALL);
 
 	@Override
diff --git a/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/test/de/schildbach/pte/live/BvgProviderLiveTest.java
index ce7a0f1a..0f3b0b9a 100644
--- a/test/de/schildbach/pte/live/BvgProviderLiveTest.java
+++ b/test/de/schildbach/pte/live/BvgProviderLiveTest.java
@@ -81,4 +81,16 @@ public class BvgProviderLiveTest
 			provider.getConnectionDetails(connection.link);
 		System.out.println(moreResult);
 	}
+
+	@Test
+	public void connectionBetweenCoordinates() throws Exception
+	{
+		final QueryConnectionsResult result = provider.queryConnections(new Location(LocationType.ADDRESS, 0, 52501507, 13357026), null,
+				new Location(LocationType.ADDRESS, 0, 52513639, 13568648), new Date(), true, ALL_PRODUCTS, WalkSpeed.NORMAL);
+		System.out.println(result);
+		final QueryConnectionsResult moreResult = provider.queryMoreConnections(result.context);
+		for (final Connection connection : result.connections)
+			provider.getConnectionDetails(connection.link);
+		System.out.println(moreResult);
+	}
 }