Fix not returning to choose-path from checkout page