applied patch for #209