Correct some minor BUG from merge