Merge pull request #1196 from Umeaboy/patch-26