Fix for #802