diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
index f9b2803..6293dec 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/QVTdDebugUIPlugin.java
@@ -109,7 +109,7 @@
 		ImageDescriptor imageDescriptor = getImageDescriptorRegistry().getDescriptor(path);
 		
 		if (imageDescriptor == null) {
-			URL url = FileLocator.find(getBundle(), new Path(path), Collections.emptyMap());
+			URL url = FileLocator.find(getBundle(), new Path(path), Collections.<String, String>emptyMap());
 			if (url != null) {
 				imageDescriptor = ImageDescriptor.createFromURL(url);
 				if (imageDescriptor != null) getImageDescriptorRegistry().put(path, imageDescriptor);
