fixbug wrond variable name
Merge branch 'fix_bugs_from_aminh'