diff --git a/bot.py b/bot.py
index 1f39039..0cb26ca 100644
--- a/bot.py
+++ b/bot.py
@@ -25,10 +25,10 @@ class Query:
             self.departure_count = int(args[-1])
             last_index_string -= 1
         request_tmp = ' '.join(args[0:last_index_string]).strip()
-        separator_index = request_tmp.find("to")
+        separator_index = request_tmp.find(" to ")
         if separator_index != -1:
             self.input = request_tmp[:separator_index - 1].strip()
-            self.destination = request_tmp[separator_index + 2:].strip()
+            self.destination = request_tmp[separator_index + 4:].strip()
         else:
             self.input = request_tmp
         if args[0].isdigit():