fixed: Real fix for eof issue?