Merge pull request #1400 from Umeaboy/patch-3