Update for #81