Fix journeys 15 and 16