[WIP] Handle the case where a value extends across two buffers