Fix bug #1434
Merge pull request #1435 from nastasi-oq/master

Fix bug #1434