diff --git a/pandora/archive/views.py b/pandora/archive/views.py
index ed4406b3..98966399 100644
--- a/pandora/archive/views.py
+++ b/pandora/archive/views.py
@@ -131,7 +131,7 @@ def upload(request):
     f = get_object_or_404_json(models.File, oshash=request.POST['id'])
     if 'frame' in request.FILES:
         if f.editable(request.user):
-            f.frames.delete()
+            f.frames.all().delete()
             for frame in request.FILES.getlist('frame'):
                 name = frame.name
                 #float required?
diff --git a/static/js/editPanel.js b/static/js/editPanel.js
index 9c439e37..8a8c7f23 100644
--- a/static/js/editPanel.js
+++ b/static/js/editPanel.js
@@ -241,9 +241,9 @@ pandora.ui.editPanel = function() {
                                 sort: data
                             }, function(result) {
                                 edit.clips.forEach(function(clip) {
-                                    clip[key] = result.data.clips.indexOf(clip.id);
+                                    clip['sort'] = result.data.clips.indexOf(clip.id);
                                 });
-                                edit.clips = Ox.sortBy(edit.clips, key);
+                                edit.clips = Ox.sortBy(edit.clips, 'sort');
                                 updateClips(edit.clips);
                             });
                         }