Fixing EOL for good