diff --git a/ChangeLog b/ChangeLog
index 1292d7833..f347bc4d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 
 2008-08-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/automatable_model.h:
+	restored old controller-behaviour for all models whose step-size is
+	not 1, i.e. only round for integer models
+
 	* plugins/sid/sid_instrument.h:
 	* plugins/sid/test.png:
 	* plugins/sid/sid_instrument.cpp:
diff --git a/include/automatable_model.h b/include/automatable_model.h
index dc0caa650..800b13d82 100644
--- a/include/automatable_model.h
+++ b/include/automatable_model.h
@@ -122,9 +122,9 @@ public:
 				castValue<T>( m_range * 
 					 m_controllerConnection->currentValue(
 							_frameOffset ) );
-			if( m_step != 0 )
+			if( m_step == 1 )
 			{
-				return( roundf( v / m_step ) * m_step );
+				return( roundf( v ) );
 			}
 			return( v );
 		}