Merge pull request #1790 from thanhchatvn/patch-2