Merge pull request #1894 from YuriPet/patch-2