add tomoki's patch