Merge pull request #1378 from patrickslin/patch-6