diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 8b400ba99a..9c0ff3428b 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -1533,8 +1533,10 @@ public:
 		std::vector<float> vBPMs;
 		const std::vector<TimingSegment*> &bpms = p->GetTimingSegments(SEGMENT_BPM);
 
-		for (unsigned i = 0; i < bpms.size(); i++)
-			vBPMs.push_back( ToBPM(bpms[i])->GetBPM() );
+		for (TimingSegment* bpm : bpms)
+		{
+			vBPMs.push_back( ToBPM(bpm)->GetBPM() );
+		}
 
 		LuaHelpers::CreateTableFromArray(vBPMs, L);
 		return 1;