got a segfault
going back to master
fixed EOF issue