Possible fix for #3712