Possible fix for #2077