Bugfixes

[norihiro]

• [x] The commit is reviewed by yourself.
• [x] The code is tested.
• [x] Document is up to date or not necessary to be changed.
• [x] The commit is compatible with repository's license.