diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
index 8a637649a..117806ded 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
@@ -27,7 +27,6 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
 import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.ThemeService;
-import com.todoroo.astrid.subtasks.AstridOrderedListFragmentHelper;
 import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface;
 import com.todoroo.astrid.subtasks.OrderedMetadataListFragmentHelper;
 import com.todoroo.astrid.subtasks.SubtasksListFragment;
@@ -77,7 +76,7 @@ public class GtasksListFragment extends SubtasksListFragment {
 
         long storeObjectId = extras.getLong(TOKEN_STORE_ID, 0);
         list = storeObjectDao.fetch(storeObjectId, LIST_PROPERTIES);
-        ((AstridOrderedListFragmentHelper<StoreObject>)helper).setList(list);
+        ((OrderedMetadataListFragmentHelper<StoreObject>)helper).setList(list);
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
index 99a647851..879c77ce6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
@@ -345,7 +345,8 @@ public abstract class AstridOrderedListUpdater<LIST> {
         ArrayList<Node> siblings = parent.children;
         int index = siblings.indexOf(task);
 
-        siblings.remove(index);
+        if (index >= 0)
+            siblings.remove(index);
         for (Node child : task.children) {
             child.parent = parent;
             siblings.add(index, child);