fixed: variable  and  undefined variables