Fix for #890