Merge "fix undefined variable"