#33 Fix akiyama bug