Potential fix for #193