1 files changed, 13 insertions, 1 deletions
diff --git a/src/grt/grt-vcd.adb b/src/grt/grt-vcd.adb
index 480da947c..85b149141 100644
--- a/src/grt/grt-vcd.adb
+++ b/src/grt/grt-vcd.adb
@@ -353,8 +353,20 @@ package body Grt.Vcd is
          when VhpiGenericDeclK
            | VhpiConstDeclK =>
             return Vcd_Variable;
+         when VhpiIndexedNameK =>
+            declare
+               Base : VhpiHandleT;
+               Err : AvhpiErrorT;
+            begin
+               Vhpi_Handle (VhpiBaseName, Sig, Base, Err);
+               if Err /= AvhpiErrorOk then
+                  raise Program_Error;
+               end if;
+               return Get_Vcd_Value_Kind (Base);
+            end;
          when others =>
-            return Vcd_Value_Bad;
+            raise Program_Error;
+            --  return Vcd_Value_Bad;
       end case;
    end Get_Vcd_Value_Kind;