diff --git a/libraries/base/mm/src/vhdl/mm_bus_comb.vhd b/libraries/base/mm/src/vhdl/mm_bus_comb.vhd
index 20bcd6b326d73c34ae03b14f16c075e025f16d30..4fda2cd307a9c12189e85bbfbf5522b4fe04a364 100644
--- a/libraries/base/mm/src/vhdl/mm_bus_comb.vhd
+++ b/libraries/base/mm/src/vhdl/mm_bus_comb.vhd
@@ -169,7 +169,9 @@ BEGIN
         ASSERT g_base_arr(I) MOD 2**g_width_arr(I) = 0 REPORT "Slave base address must be a multiple of the slave width." SEVERITY FAILURE;
         IF v_base = g_base_arr(I) / 2**g_width_arr(I) THEN
           slave_index_arr(0) <= I;   -- return index of addressed slave
-          EXIT;
+          EXIT;  -- Found addressed slave, no need to loop further. EXIT is
+                 -- not realy needed, because there can only be one 
+                 -- addressed slave so loop further will not change the index.
         END IF;
       END LOOP;
     END PROCESS;