Fixed bugs because of changing the file manager class