Suggested fix for #2072
Merge pull request #2073 from michalboska/master

Suggested fix for #2072