Bugfix to handle big files