BUGFIX : use buffer for all file reads