Use both of @x_yoshihiro and @earthquake_jp
bug fix