Fix variable assignment (again)