Potential fix for #2