Added to TODO buffer framing issue