Taishi Kato
Fix some bugs #askmakers