Potential fix for #2055