Fixed bug with arrival estimates