Merge "Fix bad variable expansion"