Merge pull request #1399 from Umeaboy/patch-2