Arrival bug fixed