This should be a more robust fix for the return trip bug.