diff --git a/ChangeLog b/ChangeLog
index 3ed5117b8..c27046fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-26	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/widgets/automatable_button.cpp:
+	- call updateButtons() after model-change
+	- use model()->value() rather than value()
+
+	* plugins/triple_oscillator/triple_oscillator.cpp:
+	fixed upper boundaries for wave-shape- and modulation-algo-models
+
 2008-01-26	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/triple_oscillator/triple_oscillator.h:
diff --git a/src/widgets/automatable_button.cpp b/src/widgets/automatable_button.cpp
index 73f824e0b..d7846e43a 100644
--- a/src/widgets/automatable_button.cpp
+++ b/src/widgets/automatable_button.cpp
@@ -234,6 +234,7 @@ void automatableButtonGroup::modelChanged( void )
 	connect( model(), SIGNAL( dataChanged() ),
 			this, SLOT( updateButtons() ) );
 	autoModelView::modelChanged();
+	updateButtons();
 }
 
 
@@ -244,7 +245,7 @@ void automatableButtonGroup::updateButtons( void )
 	int i = 0;
 	foreach( automatableButton * btn, m_buttons )
 	{
-		btn->model()->setValue( i == value() );
+		btn->model()->setValue( i == model()->value() );
 		++i;
 	}
 }