Hotfix for testcase
Merge pull request #119 from phuonghuynh/master

Hotfix for testcase