Fixing the FileManager