diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index f8f3654d0b..4661fb0254 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 $next | 20111xxx
 --------------------------------------------------------------------------------
 
+2011/12/23
+----------
+* [Song] Fixed a bug where a sample start of 0 wouldn't work. [AJ]
+
 2011/12/22
 ----------
 * [LuaManager] Added ProductFamily() Lua binding. [AJ]
diff --git a/src/Song.cpp b/src/Song.cpp
index 3973a7575a..99bed8218f 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -563,7 +563,7 @@ void Song::TidyUpData( bool fromCache, bool duringCache )
 	TranslateTitles();
 
 	if( m_fMusicSampleStartSeconds == -1 ||
-		m_fMusicSampleStartSeconds == 0 ||
+		m_fMusicSampleLengthSeconds == 0 ||
 		m_fMusicSampleStartSeconds+m_fMusicSampleLengthSeconds > this->m_fMusicLengthSeconds )
 	{
 		const TimingData &timing = this->m_SongTiming;