FIx #324
Merge pull request #325 from aesedepece/fix-for-issue-324

FIx #324