Fix EOF checking
2 files changed