Changing multi-line payload logic to keep buffering