minor buffer completion improvement