Little Bugfix
Merge branch 'fileManager'