diff --git a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
index 5cf86cc86d9d25a17e9e5275b7c0e3255c945f66..c0721758ee20f2fa398b23ee8374d104eccb0b72 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/Task.kt
@@ -295,7 +295,7 @@ class Task : IAppBaseCallback {
             override fun onError(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?, exception: java.lang.Exception?) {
                 Log.i(TAG, "upload error uploadCount: $uploadCount " + uploadInfo?.toString())
                 uploadCount++
-                if (uploadCount == totalUpload) {
+                if (uploadCount == totalUpload - 1) {
                     uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size)
                 }
             }
@@ -303,7 +303,7 @@ class Task : IAppBaseCallback {
             override fun onCompleted(context: Context?, uploadInfo: UploadInfo?, serverResponse: ServerResponse?) {
                 Log.i(TAG, "onCompleted...uploadCount: $uploadCount")
                 uploadCount++
-                if (uploadCount == totalUpload) {
+                if (uploadCount == totalUpload - 1) {
                     uploadComplete(uploadCount - uploadInfo?.successfullyUploadedFiles!!.size)
                 }
             }
@@ -325,7 +325,7 @@ class Task : IAppBaseCallback {
             this.uploadImages.forEach {
                 val uploadFile = File(it)
                 if (uploadFile.exists()) {
-                    uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath())
+                    uploadRequest.addFileToUpload(it, Config.instance.getFtpRemotePath() + "/" + uploadFile.name)
                 }
             }