Fix failure by refactoring, undecl variable.