Fix #1686
Merge pull request #1687 from antgonza/fix_1686

Fix #1686