Fix #1582
Merge pull request #1596 from mgrabovsky/fix1582

Fix #1582