Fixes #39

As noted, this PR should address the issue I was encountering in Issue #39.