Potential fix for #1