[fix] File Manager
Merge pull request #834 from anandpdoshi/anand-september-10

[fix] File Manager