--- libgig/trunk/src/gig.cpp	2021/06/18 14:23:21	3942
+++ libgig/trunk/src/gig.cpp	2021/06/18 14:56:53	3943
@@ -6611,12 +6611,8 @@
             }
         }
         if (!pInstruments) return NULL;
-        InstrumentsIterator = pInstruments->begin();
-        for (size_t i = 0; InstrumentsIterator != pInstruments->end(); i++) {
-            if (i == index) return static_cast<gig::Instrument*>( *InstrumentsIterator );
-            InstrumentsIterator++;
-        }
-        return NULL;
+        if (index >= pInstruments->size()) return NULL;
+        return static_cast<gig::Instrument*>( (*pInstruments)[index] );
     }
 
     /** @brief Add a new instrument definition.