Add new file bugfix
Merge branch 'bugfix'