applied a patch for #225