Fix bug name of file is wrong
Merge branch 'hotfix/fix-bugs'