Expand buffer at once then fill it at once

Expand buffer at once then fill it at once #3917