Possible fix for #1813