Fix issue #1974
Merge pull request #1975 from rarila/isue-1974

Fix issue #1974