Merge "Fix variable assignment"