Add workaround for bug #6.
Merge pull request #7 from toddmazierski/bug_6_workaround

Workaround for bug #6