Close GH-7: Potential fix for #5.