Update for #268