Possible fix for #2041