diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java
index a4ef95a2..99d8481b 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/InstantiationManager.java	
@@ -175,22 +175,21 @@ public class InstantiationManager {
 	}
 
 	public String createUniqueName(ComponentType componentType,
-			Project currentProject) {
-		int i = 0;
+			Project currentProject) {		
 		boolean exists = true;
 		List<IDIYComponent<?>> components = currentProject.getComponents();
 		String[] takenNames = new String[components.size()];
 		for (int j = 0; j < currentProject.getComponents().size(); j++) {
-			takenNames[j] = components.get(i).getName();
+			takenNames[j] = components.get(j).getName();
 		}
 		Arrays.sort(takenNames);
+		int i = 0;
 		while (exists) {
 			i++;
 			String name = componentType.getNamePrefix() + i;
 			exists = false;
 			if (Arrays.binarySearch(takenNames, name) >= 0) {
-				exists = true;
-				break;
+				exists = true;	
 			}
 		}
 		return componentType.getNamePrefix() + i;