Potential fix for #2124