diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
index 36312d651..1fb3a74c6 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
@@ -260,7 +260,7 @@ void LocalZynAddSubFx::processAudio( sampleFrame * _out )
 	float outputl[synth->buffersize];
 	float outputr[synth->buffersize];
 
-	m_master->GetAudioOutSamples( SOUND_BUFFER_SIZE, SAMPLE_RATE, outputl, outputr );
+	m_master->GetAudioOutSamples( synth->buffersize, synth->samplerate, outputl, outputr );
 
 	// TODO: move to MixHelpers
 	for( int f = 0; f < synth->buffersize; ++f )
diff --git a/plugins/zynaddsubfx/zynaddsubfx b/plugins/zynaddsubfx/zynaddsubfx
index 2ffc12005..e97ff9076 160000
--- a/plugins/zynaddsubfx/zynaddsubfx
+++ b/plugins/zynaddsubfx/zynaddsubfx
@@ -1 +1 @@
-Subproject commit 2ffc12005865855add8fa7f3129e563e34215c06
+Subproject commit e97ff9076c7b3fdf7ba8410c2e94970d9418f48c