diff --git a/includes/project_edit_issues.inc b/includes/project_edit_issues.inc
index 8cf0386..65ff691 100644
--- a/includes/project_edit_issues.inc
+++ b/includes/project_edit_issues.inc
@@ -88,7 +88,7 @@ function project_issue_project_edit_form(&$form_state, $node) {
   $form['component']['#tree'] = TRUE;
   $number_components = count($node->project_issue['components']);
   $delta = max(20, $number_components + 10);
-  foreach ($node->project_issue['components'] as $component) {
+  foreach ($node->project_issue['components'] as $index => $component) {
     $default_component_options[$component] = $component;
     $form['component'][$component]['name'] = array(
       '#type' => 'textfield',
@@ -105,7 +105,7 @@ function project_issue_project_edit_form(&$form_state, $node) {
     // currently stored in the DB or node. So, we can just use the $weight.
     // Using an integer offset avoids problems with urlencoding for component
     // names that have '/' in them.
-    $del_link = ($component != $node->project_issue['default_component']) ? l(t('Delete'), 'node/'. $node->nid .'/edit/component/delete/'. $weight) : '';
+    $del_link = ($component != $node->project_issue['default_component']) ? l(t('Delete'), 'node/'. $node->nid .'/edit/component/delete/'. $index) : '';
     $form['component'][$component]['delete'] = array(
       '#type' => 'markup',
       '#value' => $del_link,
@@ -292,5 +292,3 @@ function project_issue_delete_component($project, $component) {
   db_query("UPDATE {project_issue_projects} SET components = '%s' WHERE nid = %d", serialize($components), $project->nid);
   db_query("UPDATE {node} SET changed = %d WHERE nid = %d", time(), $project->nid);
 }
-
-