diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp
index fba80cb58..09722fc14 100644
--- a/sources/diagramcontext.cpp
+++ b/sources/diagramcontext.cpp
@@ -65,6 +65,13 @@ bool DiagramContext::addValue(const QString &key, const QVariant &value) {
 	return(false);
 }
 
+/**
+	Clear the content of this diagram context.
+*/
+void DiagramContext::clear() {
+	content_.clear();
+}
+
 bool DiagramContext::operator==(const DiagramContext &dc) const {
 	return(content_ == dc.content_);
 }
diff --git a/sources/diagramcontext.h b/sources/diagramcontext.h
index 20cc4453c..7b8d6c378 100644
--- a/sources/diagramcontext.h
+++ b/sources/diagramcontext.h
@@ -36,6 +36,7 @@ class DiagramContext {
 	bool contains(const QString &) const;
 	const QVariant operator[](const QString &) const;
 	bool addValue(const QString &, const QVariant &);
+	void clear();
 	
 	bool operator==(const DiagramContext &) const;
 	bool operator!=(const DiagramContext &) const;
diff --git a/sources/titleblockproperties.cpp b/sources/titleblockproperties.cpp
index e54fbc2e6..c339a4da0 100644
--- a/sources/titleblockproperties.cpp
+++ b/sources/titleblockproperties.cpp
@@ -102,6 +102,7 @@ void TitleBlockProperties::fromXml(const QDomElement &e) {
 	if (e.hasAttribute("titleblocktemplate")) template_name = e.attribute("titleblocktemplate");
 	
 	// reads the additional fields used to fill the title block
+	context.clear();
 	foreach (QDomElement property, QET::findInDomElement(e, "properties", "property")) {
 		if (!property.hasAttribute("name")) continue;
 		context.addValue(property.attribute("name"), QVariant(property.text()));