Merge "Fix the wrong assignment"