Issue #2137273: Really fix the issue :|
Merge pull request #33 from BluesparkLabs/issue-2137273

Issue #2137273: Really fix the issue :|