diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
index dcf99b2f5..16db225e4 100644
--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -81,7 +81,7 @@ organicInstrument::organicInstrument( InstrumentTrack * _instrument_track ) :
 	m_fx1Model( 0.0f, 0.0f, 0.99f, 0.01f , this, tr( "Distortion" ) ),
 	m_volModel( 100.0f, 0.0f, 200.0f, 1.0f, this, tr( "Volume" ) )
 {
-	m_numOscillators = 8;
+	m_numOscillators = NUM_OSCILLATORS;
 
 	m_osc = new OscillatorObject*[ m_numOscillators ];
 	for (int i=0; i < m_numOscillators; i++)
@@ -235,15 +235,14 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 		Oscillator * oscs_l[m_numOscillators];
 		Oscillator * oscs_r[m_numOscillators];
 
+		_n->m_pluginData = new oscPtr;
+
 		for( int i = m_numOscillators - 1; i >= 0; --i )
 		{
-			
-			m_osc[i]->m_phaseOffsetLeft = rand()
-							/ ( RAND_MAX + 1.0f );
-			m_osc[i]->m_phaseOffsetRight = rand()
-							/ ( RAND_MAX + 1.0f );
-			
-
+			static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i] 
+				= rand() / ( RAND_MAX + 1.0f );
+			static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i] 
+				= rand() / ( RAND_MAX + 1.0f );
 			
 			// initialise ocillators
 			
@@ -255,7 +254,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningLeft,
-						m_osc[i]->m_phaseOffsetLeft,
+						static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i],
 						m_osc[i]->m_volumeLeft );
 				// create right oscillator
 				oscs_r[i] = new Oscillator(
@@ -263,7 +262,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningRight,
-						m_osc[i]->m_phaseOffsetRight,
+						static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i],
 						m_osc[i]->m_volumeRight );
 			}
 			else
@@ -274,7 +273,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningLeft,
-						m_osc[i]->m_phaseOffsetLeft,
+						static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetLeft[i],
 						m_osc[i]->m_volumeLeft,
 						oscs_l[i + 1] );
 				// create right oscillator
@@ -283,7 +282,7 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 						&m_modulationAlgo,
 						_n->frequency(),
 						m_osc[i]->m_detuningRight,
-						m_osc[i]->m_phaseOffsetRight,
+						static_cast<oscPtr *>( _n->m_pluginData )->phaseOffsetRight[i],
 						m_osc[i]->m_volumeRight,
 						oscs_r[i + 1] );
 			}
@@ -291,7 +290,6 @@ void organicInstrument::playNote( NotePlayHandle * _n,
 				
 		}
 
-		_n->m_pluginData = new oscPtr;
 		static_cast<oscPtr *>( _n->m_pluginData )->oscLeft = oscs_l[0];
 		static_cast<oscPtr *>( _n->m_pluginData )->oscRight = oscs_r[0];
 	}
@@ -330,6 +328,7 @@ void organicInstrument::deleteNotePluginData( NotePlayHandle * _n )
 						_n->m_pluginData )->oscLeft );
 	delete static_cast<Oscillator *>( static_cast<oscPtr *>(
 						_n->m_pluginData )->oscRight );
+	
 	delete static_cast<oscPtr *>( _n->m_pluginData );
 }
 
diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h
index a5ef5451e..6b368f01d 100644
--- a/plugins/organic/organic.h
+++ b/plugins/organic/organic.h
@@ -39,6 +39,7 @@ class Knob;
 class NotePlayHandle;
 class PixmapButton;
 
+const int NUM_OSCILLATORS = 8;
 const int NUM_HARMONICS = 18;
 const QString HARMONIC_NAMES[NUM_HARMONICS] =  {
 	"Octave below",
@@ -153,6 +154,8 @@ private:
 		MM_OPERATORS
 		Oscillator * oscLeft;
 		Oscillator * oscRight;
+		float phaseOffsetLeft[NUM_OSCILLATORS];
+		float phaseOffsetRight[NUM_OSCILLATORS];		
 	} ;
 
 	const IntModel m_modulationAlgo;