Fix #327
Merge pull request #328 from aesedepece/fix-for-issue-327

Fix #327