Potential fix for #48