diff --git a/src/core/song.cpp b/src/core/song.cpp
index 612ee3875..a1a27c3d6 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -666,7 +666,8 @@ void song::addBBTrack()
 {
 	engine::mixer()->lock();
 	track * t = track::create( track::BBTrack, this );
-	engine::getBBTrackContainer()->setCurrentBB( dynamic_cast<bbTrack *>( t )->index() );
+	engine::getBBTrackContainer()->setCurrentBB(
+						bbTrack::numOfBBTrack( t ) );
 	engine::mixer()->unlock();
 }