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