Fix #605
Merge pull request #606 from untitaker/issue605

Fix #605