diff --git a/ChangeLog b/ChangeLog
index 887bebb54..8625f6127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/fx_mixer.cpp:
+	completed recent changes to saveSettings() / loadSettings()
+
 2008-03-22	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* data/themes/default/main_toolbar_bg.png:
diff --git a/configure.in b/configure.in
index 1059d632c..912dd98df 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.4.0-svn20080315, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080315)
+AC_INIT(lmms, 0.4.0-svn20080324, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20080324)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/src/core/fx_mixer.cpp b/src/core/fx_mixer.cpp
index 3aaa7515b..288303bdd 100644
--- a/src/core/fx_mixer.cpp
+++ b/src/core/fx_mixer.cpp
@@ -225,15 +225,17 @@ void fxMixer::saveSettings( QDomDocument & _doc, QDomElement & _this )
 void fxMixer::loadSettings( const QDomElement & _this )
 {
 	clear();
+	QDomNode node = _this.firstChild();
 	for( int i = 0; i <= NumFxChannels; ++i )
 	{
-		QDomElement fxch = _this.firstChildElement(
-					QString( "fxchannel%1" ).arg( i ) );
-		m_fxChannels[i]->m_fxChain.restoreState(
+		QDomElement fxch = node.toElement();
+		int num = fxch.attribute( "num" ).toInt();
+		m_fxChannels[num]->m_fxChain.restoreState(
 			fxch.firstChildElement(
-				m_fxChannels[i]->m_fxChain.nodeName() ) );
-		m_fxChannels[i]->m_volumeModel.loadSettings( fxch, "volume" );
-		m_fxChannels[i]->m_name = fxch.attribute( "name" );
+				m_fxChannels[num]->m_fxChain.nodeName() ) );
+		m_fxChannels[num]->m_volumeModel.loadSettings( fxch, "volume" );
+		m_fxChannels[num]->m_name = fxch.attribute( "name" );
+		node = node.nextSibling();
 	}
 
 	emit dataChanged();