diff --git a/ChangeLog b/ChangeLog
index e08c0687a..828b647d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-02	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* include/ladspa_control.h:
+	* src/widgets/ladspa_control_view.cpp:
+	* src/widgets/tempo_sync_knob.cpp:
+	fixed wrong integration of tempoSyncKnobModel
+
+	* src/core/mv_base.cpp:
+	made dataChanged()->update() connection queued
+
 2008-03-01	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/patman/patman.cpp:
diff --git a/include/ladspa_control.h b/include/ladspa_control.h
index f330a66bd..dc83a1ae2 100644
--- a/include/ladspa_control.h
+++ b/include/ladspa_control.h
@@ -72,9 +72,9 @@ public:
 		return( &m_knobModel );
 	}
 
-	inline knobModel * getTempoSyncKnobModel( void )
+	inline tempoSyncKnobModel * getTempoSyncKnobModel( void )
 	{
-		return( &m_knobModel );
+		return( &m_tempoSyncKnobModel );
 	}
 
 	inline port_desc_t * getPort( void )
diff --git a/src/widgets/ladspa_control_view.cpp b/src/widgets/ladspa_control_view.cpp
index 5132ac2ba..f6894efb5 100644
--- a/src/widgets/ladspa_control_view.cpp
+++ b/src/widgets/ladspa_control_view.cpp
@@ -96,7 +96,14 @@ ladspaControlView::ladspaControlView( QWidget * _parent,
 
 	if( knb != NULL )
 	{
-		knb->setModel( m_ctl->getKnobModel() );
+		if( m_ctl->getPort()->data_type != TIME )
+		{
+			knb->setModel( m_ctl->getKnobModel() );
+		}
+		else
+		{
+			knb->setModel( m_ctl->getTempoSyncKnobModel() );
+		}
 		knb->setLabel( m_ctl->getPort()->name );
 		knb->setHintText( tr( "Value:" ) + " ", "" );
 		knb->setWhatsThis( tr( "Sorry, no help available." ) );
diff --git a/src/widgets/tempo_sync_knob.cpp b/src/widgets/tempo_sync_knob.cpp
index b8d0ca9b5..48134689a 100644
--- a/src/widgets/tempo_sync_knob.cpp
+++ b/src/widgets/tempo_sync_knob.cpp
@@ -237,6 +237,10 @@ tempoSyncKnob::~tempoSyncKnob()
 
 void tempoSyncKnob::modelChanged( void )
 {
+	if( model() == NULL )
+	{
+		printf( "no tempoSyncKnobModel has been set!\n" );
+	}
 	m_custom->setModel( &model()->m_custom );
 	connect( model(), SIGNAL( syncModeChanged( tempoSyncMode ) ),
 			this, SLOT( updateDescAndIcon() ) );