Fix #1545
Merge pull request #1573 from Igorbek/master

Fix #1545