Fix #80
Merge pull request #290 from aesedepece/fix-for-issue-80

Fix #80