Potential fix for #5