Merge "use more correct case condition when consume input"