Fix issue #2193
Merge pull request #2231 from CIB/master

Fix issue #2193