Fixes #2141
Merge pull request #2143 from fdlk/feature/2141

Fixes #2141