bug fix
Merge branch 'hotfix/hibikana'