bug fix EOF handling