diff --git a/src/ITASampleBuffer.cpp b/src/ITASampleBuffer.cpp
index e152de5c143e7979a758eebb9bae6f125797549a..6898887c9c52a5f574b7322ec11ca2dcd5e97d8e 100644
--- a/src/ITASampleBuffer.cpp
+++ b/src/ITASampleBuffer.cpp
@@ -12,16 +12,25 @@
 
 
 ITASampleBuffer::ITASampleBuffer()
-	: m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL ) {}
+	: m_pParent( NULL )
+	, m_iLength( 0 )
+	, m_pfData( NULL )
+{
+
+}
 
 ITASampleBuffer::ITASampleBuffer( int iLength, bool bZeroinit )
-	: m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL )
+	: m_pParent( NULL )
+	, m_iLength( 0 )
+	, m_pfData( NULL )
 {
 	Init( iLength, bZeroinit );
 }
 
 ITASampleBuffer::ITASampleBuffer( const ITASampleBuffer* pSource )
-	: m_pParent( NULL ), m_iLength( 0 ), m_pfData( NULL )
+	: m_pParent( NULL )
+	, m_iLength( 0 )
+	, m_pfData( NULL )
 {
 	*this = *pSource;
 }
diff --git a/src/ITASampleFrame.cpp b/src/ITASampleFrame.cpp
index 13cdf932d240c3a6e9e51329960d41b05b7a6b88..78532d3262b9a8aea73aae3b573c15298d5380e3 100644
--- a/src/ITASampleFrame.cpp
+++ b/src/ITASampleFrame.cpp
@@ -403,15 +403,16 @@ const ITASampleBuffer& ITASampleFrame::operator[](int iChannel) const {
 	return m_vChannels[iChannel];
 }
 
-ITASampleFrame& ITASampleFrame::operator=(const ITASampleFrame& rhs) {
-	// Selbstzuweisung abfangen
-	if (&rhs == this) return *this;
+ITASampleFrame& ITASampleFrame::operator=( const ITASampleFrame& rhs )
+{
+	// No self assignment
+	if( &rhs == this )
+		return *this;
 
-	// Neu allozieren
-	init( rhs.channels(), rhs.length(), false);
+	init( rhs.channels(), rhs.length(), false );
 
-	// Kanaldaten kopieren
-	for (int i=0; i<m_iChannels; i++) (*this)[i] = rhs[i];
+	for( int i = 0; i < m_iChannels; i++ )
+		( *this )[ i ].write( rhs[ i ], this->GetLength() );
 
 	return *this;
 }