Fix issue #1924
Merge pull request #1932 from rarila/issue-1924

Fix issue #1924