Fix #424
Merge pull request #426 from antgonza/issue_424

Fix #424