Merge "Fix the duplicated parameter"