Update for #32