Update for #236