Suggested fix for issue #121

It's cumbersome working around issue #121. Since it's getting no love, I thought I'd suggest a fix.