Possible fix for #1010