diff --git a/radio/processor/src/Buffer.tcc b/radio/processor/src/Buffer.tcc
index 676e889..75ddafd 100644
--- a/radio/processor/src/Buffer.tcc
+++ b/radio/processor/src/Buffer.tcc
@@ -101,7 +101,6 @@ typename Buffer<T>::Result Buffer<T>::write(const T *pData, size_t len)
 		RETURN_OR_EXCEPT(Result::Err_InvalidSize);
 	}
 
-	size_t numWritten = 0;
 	while(len)
 	{
 		size_t num_remain = m_capacity - m_wi;
@@ -110,9 +109,9 @@ typename Buffer<T>::Result Buffer<T>::write(const T *pData, size_t len)
 		memcpy(data_w(), pData, actual_len*sizeof(T));
 		len -= actual_len;
 		pData += actual_len;
-		numWritten += actual_len;
+		produce(actual_len);
 	}
-	return produce(numWritten);
+	return Result::Ok;
 }
 
 template<typename T>
@@ -123,7 +122,6 @@ typename Buffer<T>::Result Buffer<T>::read(T* pData, size_t len)
 		RETURN_OR_EXCEPT(Result::Err_InvalidSize);
 	}
 
-	size_t numRead = 0;
 	while(len)
 	{
 		size_t num_remain = m_capacity - m_ri;
@@ -132,9 +130,9 @@ typename Buffer<T>::Result Buffer<T>::read(T* pData, size_t len)
 		memcpy(pData, data_r(), actual_len*sizeof(T));
 		len -= actual_len;
 		pData += actual_len;
-		numRead += actual_len;
+		consume(actual_len);
 	}
-	return consume(numRead);
+	return Result::Ok;
 }
 
 template<typename T>