Fix for #848