take buffers for Split/Match into account fixes #6334