Bug fix for multi part trip