diff --git a/lib/Travelynx/Helper/HAFAS.pm b/lib/Travelynx/Helper/HAFAS.pm
index e04245b..c612238 100644
--- a/lib/Travelynx/Helper/HAFAS.pm
+++ b/lib/Travelynx/Helper/HAFAS.pm
@@ -195,7 +195,8 @@ sub get_xml_p {
 
 			# More fixes for invalid XML
 			$body =~ s{P&R}{P&R};
-			$body =~ s{Wagen \d+ \K&(?= )}{&};
+			$body =~ s{Wagen \d+ \K&}{&};
+			$body =~ s{Wagen \d+, \d+ \K&}{&};
 
 			# <Attribute [...] text="[...] "[...]"" /> is invalid XML.
 			# Work around it.