Potential fix for #58