patch for #268