diff --git a/ChangeLog b/ChangeLog
index 0ab8570d8..1734e5e12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	* plugins/sf2_player/sf2_player.h:
 	Add gain, chorus, and reverb controls
 
+	* include/instrument_functions.h:
+	* src/core/instrument_functions.cpp:
+	Fixed arpeggio direction loading
+
 2008-04-26	Tobias Dorffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/stereo_enhancer/stereo_enhancer.cpp:
diff --git a/include/instrument_functions.h b/include/instrument_functions.h
index c98510940..8ef2c7c6c 100644
--- a/include/instrument_functions.h
+++ b/include/instrument_functions.h
@@ -99,7 +99,8 @@ public:
 		ArpDirUp,
 		ArpDirDown,
 		ArpDirUpAndDown,
-		ArpDirRandom
+		ArpDirRandom,
+		NumArpDirections
 	} ;
 
 	arpeggiator( instrumentTrack * _instrument_track );
diff --git a/src/core/instrument_functions.cpp b/src/core/instrument_functions.cpp
index 017ff8c43..c946b3d8f 100644
--- a/src/core/instrument_functions.cpp
+++ b/src/core/instrument_functions.cpp
@@ -287,7 +287,7 @@ arpeggiator::arpeggiator( instrumentTrack * _instrument_track ) :
 	m_arpRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this ),
 	m_arpTimeModel( 100.0f, 25.0f, 2000.0f, 1.0f, 1.0, this ),
 	m_arpGateModel( 100.0f, 1.0f, 200.0f, 1.0f, this ),
-	m_arpDirectionModel( 0, 0, 0, intModel::defaultRelStep(), this ),
+	m_arpDirectionModel( 0, 0, NumArpDirections, intModel::defaultRelStep(), this ),
 	m_arpModeModel( this )
 {
 	m_arpEnabledModel.setTrack( _instrument_track );