Update fix for #451