Potential fix for #43