Fix #298
Merge pull request #322 from aesedepece/fix-for-issue-298

Fix #298