diff --git a/src/chat.rs b/src/chat.rs
index b9d064a..789edca 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -50,6 +50,7 @@ pub const NON_CHOICE_TOKENS: &[&str] = &[
     TOKEN_NOWAIT,
 ];
 pub const SKIPPABLE_TOKENS: &[&str] = &[
+    TOKEN_CHAT,
     TOKEN_LABEL,
     TOKEN_GOTO,
     TOKEN_NOWAIT,
diff --git a/src/chats/startrans.yaml b/src/chats/startrans.yaml
index d660135..46feec6 100644
--- a/src/chats/startrans.yaml
+++ b/src/chats/startrans.yaml
@@ -7,9 +7,9 @@
 
 
 - chat: ClippyTransSerenity
+- set: busstop serenity
 - Welcome at StarTrans Cargo Services!  You have reached Serenity Station.
 - "Ready for a trip?  Available bus stops: Oscillation Station, Metis Prime Station"
-- set: busstop serenity
 - label: startransbusstop
 - include: BusStops
 - label: interesting
@@ -21,9 +21,9 @@
 
 
 - chat: ClippyTransMetis
+- set: busstop metis
 - Welcome at StarTrans Cargo Services!  You have reached Metis Prime Station.
 - "Ready for a trip?  Available bus stops: Oscillation Station, Serenity Station"
-- set: busstop metis
 - label: startransbusstop
 - include: BusStops
 - label: interesting
@@ -36,9 +36,9 @@
 
 
 - chat: ClippyTransOscillation
+- set: busstop oscillation
 - Welcome at StarTrans Cargo Services!  You have reached Oscillation Station.
 - "Ready for a trip?  Available bus stops: Serenity Station, Metis Prime Station"
-- set: busstop oscillation
 - label: startransbusstop
 - include: BusStops
 - label: interesting