diff --git a/src/etc/testcases/taskdefs/optional/script.xml b/src/etc/testcases/taskdefs/optional/script.xml
index fc54325db..884dc5a01 100644
--- a/src/etc/testcases/taskdefs/optional/script.xml
+++ b/src/etc/testcases/taskdefs/optional/script.xml
@@ -10,7 +10,7 @@
 
       for (i=1; i<=10; i++) {
         echo = testproject.createTask("echo");
-        example1.addTask(echo);
+        setup1.addTask(echo);
         echo.setMessage(i*i);
       }
 
diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java
index 1433aa249..a1967e5f9 100644
--- a/src/main/org/apache/tools/ant/Target.java
+++ b/src/main/org/apache/tools/ant/Target.java
@@ -311,9 +311,8 @@ public class Target implements TaskContainer {
      */
     public void execute() throws BuildException {
         if (testIfCondition() && testUnlessCondition()) {
-            Iterator it = children.iterator();
-            while (it.hasNext()) {
-                Object o = it.next();
+            for (int i = 0; i < children.size(); ++i) {
+                Object o = children.get(i);
                 if (o instanceof Task) {
                     Task task = (Task) o;
                     task.perform();