diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
index 5292284be..6241b7e83 100644
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -1,7 +1,7 @@
 /*
  * vestige.cpp - instrument-plugin for hosting VST-instruments
  *
- * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -37,7 +37,6 @@
 #include "instrument_track.h"
 #include "vst_plugin.h"
 #include "pixmap_button.h"
-#include "song.h"
 #include "text_float.h"
 #include "tooltip.h"
 
@@ -163,11 +162,7 @@ void vestigeInstrument::loadFile( const QString & _file )
 	}
 
 	m_plugin->showEditor();
-	connect( engine::getSong(), SIGNAL( tempoChanged( bpm_t ) ),
-			m_plugin, SLOT( setTempo( bpm_t ) ) );
-	m_plugin->setTempo( engine::getSong()->getTempo() );
-	connect( engine::getMixer(), SIGNAL( sampleRateChanged() ),
-				m_plugin, SLOT( updateSampleRate() ) );
+
 	if( set_ch_name )
 	{
 		getInstrumentTrack()->setName( m_plugin->name() );
diff --git a/plugins/vst_base/vst_plugin.cpp b/plugins/vst_base/vst_plugin.cpp
index 8b95e3b77..a7e51c1a6 100644
--- a/plugins/vst_base/vst_plugin.cpp
+++ b/plugins/vst_base/vst_plugin.cpp
@@ -1,7 +1,7 @@
 /*
  * vst_plugin.cpp - implementation of vstPlugin class
  *
- * Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -48,6 +48,7 @@
 #include "config_mgr.h"
 #include "engine.h"
 #include "main_window.h"
+#include "song.h"
 #include "templates.h"
 
 
@@ -152,6 +153,13 @@ vstPlugin::vstPlugin( const QString & _plugin ) :
 		delete helper;
 	}
 #endif
+
+	setTempo( engine::getSong()->getTempo() );
+
+	connect( engine::getSong(), SIGNAL( tempoChanged( bpm_t ) ),
+			this, SLOT( setTempo( bpm_t ) ) );
+	connect( engine::getMixer(), SIGNAL( sampleRateChanged() ),
+				this, SLOT( updateSampleRate() ) );
 }