Fix use of variables, because