diff --git a/XML_Moodle.py b/XML_Moodle.py
index d1659b8551f28dfe2d4c671fecff16ac3079ffdc..f1da54d3d8fb4c6bbfed07eb048ffe5aeb293b8e 100755
--- a/XML_Moodle.py
+++ b/XML_Moodle.py
@@ -65,7 +65,7 @@ class Quizz:
 class Question:
 	def __init__(self,xmlQ,c,n,f):
 		self.folder = f
-		self.id = mlang_2_multiling(xmlQ.find("name/text").text,"en")+f".{n}"
+		self.id = c+"."+mlang_2_multiling(xmlQ.find("name/text").text,"en")+f".{n}"
 		self.q = strip_tags(mlang_2_multiling(xmlQ.find("questiontext/text").text), self.folder,self.id)
 		self.category = c
 		self.env = "todo:"+xmlQ.attrib["type"]
diff --git a/utils.py b/utils.py
index 4f9302aeebf1eaffa907b3f2b057be55ff24a919..dd896b6e0608afd60b70fd54f280bd576173357a 100644
--- a/utils.py
+++ b/utils.py
@@ -22,13 +22,7 @@ def process_listings(txt, folder="",q="q"):
 def remove_moodle_cdata(txt, folder, q):
 	global unsafe
 	txt = process_listings(txt, folder, q)
-	res = sub(r'<img src="[^/]*/([^"]*)" (alt="([^"]*)")?[^>]*>', r"""\\begin{figure}[h!]
-	\\begin{center}
-		\\includegraphics[width=0.8\\linewidth]{Images/\1}
-	\\end{center}
-	\\caption{\3}
-\\end{figure}
-""",txt).replace("<![CDATA[","").replace("]]>","").replace("<strong>","\\emph{").replace("</strong>","}")
+	res = sub(r'<img src="[^/]*/([^"]*)" (alt="([^"]*)")?[^>]*>', r"""\\\\\\includegraphics[width=0.8\\linewidth]{Images/\1}""",txt).replace("<![CDATA[","").replace("]]>","").replace("<strong>","\\emph{").replace("</strong>","}")
 	if unsafe:
 		res = res.replace('<span style="font:monospace">',"\lstinline[language=python]|").replace('<span style="font-family:monospace">',"\lstinline[language=python]|").replace('<span style="font-family=monospace">',"\lstinline[language=python]|").replace("</span>","|")
 	return res