Fix for #873