Merge pull request #1984 from alimirjamali/patch-1