tmanabe fix bugs of last commit