Fix for #853