Merge pull request #1155 from Umeaboy/patch-26