diff --git a/lol/components/next-bus.js b/lol/components/next-bus.js
index 4264a22..341d6dd 100644
--- a/lol/components/next-bus.js
+++ b/lol/components/next-bus.js
@@ -95,8 +95,12 @@ class NextBusElement extends HTMLElement {
 
             {
                 let last_passage = nextPassage.getLastPassageTime()
+                let next_passage_time = time;
                 if(last_passage){
                     let time = last_passage.time
+                    if(next_passage_time.getTime() > time.getTime()){
+                        time = next_passage_time
+                    }
                     let timeEl = this.querySelector(".last-passage-time")
                     timeEl.textContent = timeFormatter.format(time)
     
@@ -127,7 +131,7 @@ class NextBusElement extends HTMLElement {
                     this.querySelector(".last-passage").style.display = "none"
                 }
 
-                if(last_passage && last_passage.time.getTime() == time.getTime()){
+                if(last_passage && last_passage.time.getTime() <= time.getTime()){
                     this.querySelector(".next-and-last").style.display = ""
                     this.querySelector(".next-passage").style.display = "none"
                 } else {
diff --git a/lol/tcl.js b/lol/tcl.js
index 4cab4e9..042fbac 100644
--- a/lol/tcl.js
+++ b/lol/tcl.js
@@ -151,7 +151,7 @@ export async function getNextPassage(stop_description, options = {
 
     let time;
     if(next_trip.schedules){
-        let next_schedule = next_trip.schedules.find(it => (new Date(it.dateTime).getTime() - Date.now()) > 120000 )
+        let next_schedule = next_trip.schedules.find(it => (new Date(it.dateTime).getTime() - Date.now()) > 5*60*1000 )
         if(!next_schedule) {
             next_schedule = next_trip.schedules[next_trip.schedules.length - 1]
         }