Modified to fix EOT.