Fix #595
Merge pull request #596 from isotas38/dev

Fix #595