Update for #501