1 files changed, 9 insertions, 6 deletions
diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv
index 5ac7908d5..aea43ee87 100644
--- a/tex/context/base/meta-ini.mkiv
+++ b/tex/context/base/meta-ini.mkiv
@@ -849,7 +849,7 @@
    \fi}
 
 \def\meta_start_code_instance#1#2\stopMPcode
-  {\meta_begin_graphic_group{#1::\s!dummy}% name does not matter
+  {\meta_begin_graphic_group{#1}%
    \meta_enable_include
    \meta_process_graphic{#2}%
    \meta_end_graphic_group}
@@ -861,22 +861,25 @@
 \let\stopMPcode\relax
 
 \unexpanded\def\MPcode
-  {\dosinglegroupempty\meta_code}
+  {\dodoublegroupempty\meta_code}
 
 \def\meta_code
-  {\iffirstargument
+  {\ifsecondargument
      \expandafter\meta_code_instance
    \else
      \expandafter\meta_code_standard
    \fi}
 
 \def\meta_code_instance#1#2%
-  {\meta_begin_graphic_group{#1::\s!dummy}% name does not matter
+  {\meta_begin_graphic_group{#1}%
+   \meta_enable_include
    \meta_process_graphic{#2}%
    \meta_end_graphic_group}
 
-\def\meta_code_standard#1% #2
-  {\meta_process_graphic}
+\def\meta_code_standard#1#2%
+  {\let\currentMPinstance\defaultMPinstance
+   \meta_enable_include
+   \meta_process_graphic{#1}}
 
 % a bit nasty (also needed for compatibility: