added a patch for bug fix of Kameda's patch