Possible fix for issue #7

I dunno if this is right, but this resolves issue #7 for me.