diff --git a/Source/Libraries/GSF.TimeSeries/Adapters/IndependentActionAdapterManagerBase.cs b/Source/Libraries/GSF.TimeSeries/Adapters/IndependentActionAdapterManagerBase.cs
index 137bb2b86c..b13cf28f2c 100644
--- a/Source/Libraries/GSF.TimeSeries/Adapters/IndependentActionAdapterManagerBase.cs
+++ b/Source/Libraries/GSF.TimeSeries/Adapters/IndependentActionAdapterManagerBase.cs
@@ -531,9 +531,9 @@ private void InitializeChildAdapters()
                 }
 
                 // Create child adapter for provided inputs to the parent bulk collection-based adapter
-                for (int i = 0; i < inputMeasurementKeys.Length; i += inputsPerAdapter)
+                for (int i = 0, adapterIndex = 0; i < inputMeasurementKeys.Length; i += inputsPerAdapter, adapterIndex++)
                 {
-                    CurrentAdapterIndex = adapters.Count;
+                    CurrentAdapterIndex = adapterIndex;
                     inputsPerAdapter = PerAdapterInputCount;
 
                     Guid[] inputs = new Guid[inputsPerAdapter];