FIX: Incorrect calculation of departure/arrival times with longer journey times.