apply patch for #123