Merge pull request #1974 from Olim98/patch-1