Fixing EOF issues.