Fix bufferIncrement