Fix : unsafe file management