Merge "Fix missing variable name"