Fix #1392
Merge pull request #1399 from flaviut/patch-1

Fix #1392