Fix #23, until a better way is found.
Merge pull request #24 from pobocks/issue_23

Fix #23, until a better way is found.