Fixed the FileManager functions