Deal with buffers less hackily