Potential fix for #80.