Provisional fix for #250, yet to be revised for 0.3.0
Merge pull request #279 from aesedepece/fix-for-issue-250

Provisional fix for #250, yet to be revised for 0.3.0