diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index da7a10b..079b14d 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -225,14 +225,12 @@ public class BucketSelect extends AppCompatActivity {
                                     ObjectListing result = s3client.listObjects(orequest);
                                     ArrayList<String> objectl = new ArrayList<String>();
                                     List<S3ObjectSummary> objects = result.getObjectSummaries();
-                                    boolean nextbatch = false;
-                                    while (result.isTruncated() || !nextbatch) {
-                                        if (nextbatch) {
-                                            result = s3client.listNextBatchOfObjects (result);
-                                            objects = result.getObjectSummaries();
-                                        } else {
-                                            nextbatch = true;
-                                        }
+                                    for (S3ObjectSummary os : objects) {
+                                        objectl.add(os.getKey());
+                                    }
+                                    while (result.isTruncated()) {
+                                        result = s3client.listNextBatchOfObjects (result);
+                                        objects = result.getObjectSummaries();
                                         for (S3ObjectSummary os : objects) {
                                             objectl.add(os.getKey());
 
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index d5560df..88dcc9c 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -546,14 +546,12 @@ public class ObjectSelect extends AppCompatActivity {
                                         ObjectListing result = s3client.listObjects(orequest);
                                         ArrayList<String> objectl = new ArrayList<String>();
                                         List<S3ObjectSummary> objects = result.getObjectSummaries();
-                                        boolean nextbatch = false;
-                                        while (result.isTruncated() || !nextbatch) {
-                                            if (nextbatch) {
-                                                result = s3client.listNextBatchOfObjects (result);
-                                                objects = result.getObjectSummaries();
-                                            } else {
-                                                nextbatch = true;
-                                            }
+                                        for (S3ObjectSummary os : objects) {
+                                            objectl.add(os.getKey());
+                                        }
+                                        while (result.isTruncated()) {
+                                            result = s3client.listNextBatchOfObjects (result);
+                                            objects = result.getObjectSummaries();
                                             for (S3ObjectSummary os : objects) {
                                                 objectl.add(os.getKey());