Feature/channel eof fix