Merge pull request #1761 from 1RV34/patch-1