Possible fix for #894