V1 bs buffer modif

similar to #845 for v1.0.