Potential fix for #51