Suggested fix for #22

I believe this should fix #22.