Fix the variable bugs.