diff --git a/datasources/mtr/bus/QueryResult.go b/datasources/mtr/bus/QueryResult.go
index a6059f8..0ae96fc 100644
--- a/datasources/mtr/bus/QueryResult.go
+++ b/datasources/mtr/bus/QueryResult.go
@@ -147,9 +147,9 @@ func (this *QueryResult) Message() (string, error) {
 						gRow[0].Name = fmt.Sprintf("%s (%s)", bName, i18n.FormatDistance(langPack, minDist))
 					} else {
 						gRow[0].Name = fmt.Sprintf(
-							"%s (%s~%s)",
-							bName, i18n.FormatDistance(langPack, minDist),
-							bName, i18n.FormatDistance(langPack, maxDist),
+							"%s (%s~%s)", bName,
+							i18n.FormatDistance(langPack, minDist),
+							i18n.FormatDistance(langPack, maxDist),
 						)
 					}
 
diff --git a/resources/langpacks/zh-Hant/messages.json b/resources/langpacks/zh-Hant/messages.json
index 60d78f1..a8ec95a 100644
--- a/resources/langpacks/zh-Hant/messages.json
+++ b/resources/langpacks/zh-Hant/messages.json
@@ -1,6 +1,6 @@
 {
     "DS.KMB.ETA.DEPARTED": "%s （走左了？）",
-    "DS.KMB.NEAREST_STOPS": "九巴：%s 範圍內車站",
+    "DS.KMB.NEAREST_STOPS": "%s 範圍內九巴站",
     "DS.KMB.NO_NEAREST_STOPS": "%s 範圍內找不到九巴站，最近 %d 個站為：",
     "DS.MTR.NEAREST_STOPS": "%s 範圍內港鐵巴士車站",
     "DS.MTR.NO_NEAREST_STOPS": "%s 範圍內找不到港鐵巴士站，最近 %d 個站為：",
diff --git a/resources/po/zh-Hant/messages.po b/resources/po/zh-Hant/messages.po
index a215d37..a70e79d 100644
--- a/resources/po/zh-Hant/messages.po
+++ b/resources/po/zh-Hant/messages.po
@@ -18,7 +18,7 @@ msgstr "%s （走左了？）"
 
 #: .DS.KMB.NEAREST_STOPS
 msgid "KMB: Showing nearest bus stops under %s"
-msgstr "九巴：%s 範圍內車站"
+msgstr "%s 範圍內九巴站"
 
 #: .DS.KMB.NO_NEAREST_STOPS
 msgid ""