Refactor failed on content->buffer: correction is ok