Fix the bug from merge