fix/Do not return EOF while streaming payload

fix/Do not return EOF while streaming payload #1158