Fix bug with using multiple 'trips'