diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
index 40fde7fb4942c2c0015ba9babd69c3bf89328a06..6999e73681893b33d247ff8e2f871b841c832271 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/dnd/DropTargetListener.java
@@ -85,6 +85,8 @@ public class DropTargetListener extends AbstractTransferDropTargetListener {
 				.getSelection();
 		Object firstElement = ((IStructuredSelection) selection)
 				.getFirstElement();
+		// FIXME clean
+		System.out.println(firstElement);
 		return firstElement;
 	}
 
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
index 0918d2f61f1a45c99be396825005d7aeabf39462..fd1cd113a976f34223e17e6bdb8db66200afea5e 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editpart/DiagramEditPartBase.java
@@ -27,6 +27,7 @@ import org.eclipse.draw2d.ConnectionLayer;
 import org.eclipse.draw2d.ConnectionRouter;
 import org.eclipse.draw2d.FreeformLayer;
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.TreeSearch;
 import org.eclipse.draw2d.XYAnchor;
 import org.eclipse.draw2d.XYLayout;
 import org.eclipse.emf.ecore.EObject;
@@ -82,7 +83,14 @@ public abstract class DiagramEditPartBase<T extends EObject> extends
 	protected IFigure createFigure() {
 		setConnectionRouter();
 
-		FreeformLayer f = new FreeformLayer();
+		FreeformLayer f = new FreeformLayer() {
+			/** {@inheritDoc} */
+			@Override
+			public IFigure findFigureAt(int x, int y, TreeSearch search) {
+				// TODO Auto-generated method stub
+				return super.findFigureAt(x, y, search);
+			}
+		};
 		f.setOpaque(false);
 		f.setLayoutManager(new XYLayout());
 		f.setBackgroundColor(ColorConstants.white);