Merge pull request #1401 from Umeaboy/patch-4