Fixes #435
Merge pull request #436 from jtorrente/issue-435

Fixes #435