Fixes #2137
Merge pull request #2138 from fdlk/fix/2137

Fixes #2137