Potential fix for #97