Potential fix for #1305