Fix for #838