Potential fix for #4