Fixing #2340

As it never got updated to fix the EOF