Minor change to file reader. Still untested.