diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/ReadMe b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/ReadMe
new file mode 100644
index 0000000000000000000000000000000000000000..e73cfeaa43e5cb6426a7d1852fbf0f99e31ef01a
--- /dev/null
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/ReadMe
@@ -0,0 +1,2 @@
+
+- please Read "Move 'plugin.xml' here and README.txt"
\ No newline at end of file
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
index 4d2e3592865cc97d43d0e2886997c95d6a57dd69..2f5881e8b7e18be648c8e5afdc42d8dd29256273 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel.repository.compositediagram/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/compositediagram/popup/actions/InitCreateDiagramWizard.java
@@ -97,6 +97,10 @@ public class InitCreateDiagramWizard implements IObjectActionDelegate {
 		 */
 		TreeIterator<EObject> it = diagramRoot.eAllContents();
 		Repository model = null;
+		if (diagramRoot instanceof Repository) {
+			model = (Repository) diagramRoot;
+		}
+		//TODO: If  >1 Repository exists: present them to choose one
 		while (it.hasNext()) {
 			EObject possibleRepo = it.next();
 			if (possibleRepo instanceof Repository) {
@@ -145,8 +149,9 @@ public class InitCreateDiagramWizard implements IObjectActionDelegate {
 			action.setEnabled(true);
 			return;
 		}
-		this.selection = (IStructuredSelection) selection;
-		IFile file = (IFile) this.selection.getFirstElement();
+//		this.selection = (IStructuredSelection) selection;
+//		IFile file = (IFile) this.selection.getFirstElement();
+		IFile file = (IFile) ((IStructuredSelection) selection).getFirstElement();
 		this.fileName = file.getName().replaceAll(".repository", "");
 		this.domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
 		action.setEnabled(true);