diff --git a/app/scripts/filters/taskOrderBy.js b/app/scripts/filters/taskOrderBy.js
index f2c0d70..99fb985 100644
--- a/app/scripts/filters/taskOrderBy.js
+++ b/app/scripts/filters/taskOrderBy.js
@@ -20,7 +20,7 @@
             } else if (orderType.type == 'percent') {
                 return orderByFilter(array, ['completePercent'], orderType.reverse);
             } else if (orderType.type == 'remain') {
-                return orderByFilter(array, ['idle', 'remainTime', 'remainPercent'], orderType.reverse);
+                return orderByFilter(array, ['idle', 'remainTime', 'remainLength'], orderType.reverse);
             } else if (orderType.type == 'dspeed') {
                 return orderByFilter(array, ['downloadSpeed'], orderType.reverse);
             } else {
diff --git a/app/scripts/services/ariaNgTaskService.js b/app/scripts/services/ariaNgTaskService.js
index 9f0842d..dcdfa73 100644
--- a/app/scripts/services/ariaNgTaskService.js
+++ b/app/scripts/services/ariaNgTaskService.js
@@ -53,15 +53,17 @@
 
             task.totalLength = parseInt(task.totalLength);
             task.completedLength = parseInt(task.completedLength);
+            task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
+            task.remainLength = task.totalLength - task.completedLength;
+            task.remainPercent = 100 - task.completePercent;
+
             task.uploadSpeed = parseInt(task.uploadSpeed);
             task.downloadSpeed = parseInt(task.downloadSpeed);
-            task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
-            task.remainPercent = 100 - task.completePercent;
+
             task.taskName = getTaskName(task);
             task.idle = task.downloadSpeed == 0;
 
-            var remainLength = task.totalLength - task.completedLength;
-            task.remainTime = calculateDownloadRemainTime(remainLength, task.downloadSpeed);
+            task.remainTime = calculateDownloadRemainTime(task.remainLength, task.downloadSpeed);
 
             if (task.files) {
                 for (var i = 0; i < task.files.length; i++) {
@@ -171,7 +173,7 @@
                 if (!angular.isArray(tasks)) {
                     return;
                 }
-                
+
                 for (var i = 0; i < tasks.length; i++) {
                     processDownloadTask(tasks[i]);
                 }