Potential fix for #139