Fixbug on branch fix after merge
Merge branch 'v1.0.fixbug' into my_kiet_branch