Solving the symptom not the issue.
Merge pull request #161 from Orasi/issue-160

Solving the symptom not the issue.