diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index bce35d3261459689a118c78137e90f887d7a1fad..62a123b0722081981ad74d4a70140120dbbce770 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -154,7 +154,7 @@ sub new {
 		  . '</wrap>';
 	}
 
-	if ( defined $service and $service eq 'NVV' ) {
+	if ( defined $service and $service =~ m{ ^ VBB | NVV $ }x ) {
 
 		# Returns invalid XML with tags inside HIMMessage's lead attribute.
 		# Fix this.