diff --git a/src/formatitko/command_util.py b/src/formatitko/command_util.py
index 002aa8c..f11a154 100644
--- a/src/formatitko/command_util.py
+++ b/src/formatitko/command_util.py
@@ -16,9 +16,9 @@ def parse_command(code: str) -> CommandCallable:
 	for line in code_lines:
 		indented_code_lines.append(("\t" if tabs else "    ")+line)
 	code = "def command(element: Command, context: Context) -> list[Element]:\n"+"\n".join(indented_code_lines)
-	command_env = command_env.__dict__
-	exec(code, command_env)
-	return command_env["command"]
+	env = {**command_env.__dict__}
+	exec(code, env)
+	return env["command"]
 
 # This function is called in trasform.py, defining a command which can be
 # called later
diff --git a/src/formatitko/html_generator.py b/src/formatitko/html_generator.py
index d7dbc03..d564044 100644
--- a/src/formatitko/html_generator.py
+++ b/src/formatitko/html_generator.py
@@ -247,7 +247,7 @@ class HTMLGenerator(OutputGenerator):
 		if (e.format == "InlineMath"):
 			self.write(rawhtml)
 		else:
-			self.writeraw()
+			self.writeraw(rawhtml)
 
 	def generate_RawInline(self, e: RawInline):
 		if e.format == "html":