Fix #198
Merge pull request #250 from codexa/issue-198

Fix #198