Potential fix for #119