[fix] an undefined var exception
Merge remote-tracking branch 'origin/master'