Fixes #2810
Merge pull request #2811 from nikeee/patch-1

Fixes #2810