diff --git a/main.go b/main.go
index 85e64dd..4867758 100644
--- a/main.go
+++ b/main.go
@@ -314,19 +314,20 @@ func awss3(w http.ResponseWriter, r *http.Request) {
                }
                path = link.URL + path[idx+12:]
        }
+       var pathToGet string
        if strings.HasSuffix(path, "/") {
-               if c.directoryListing {
-                       s3listFiles(w, r, c.s3Bucket, c.s3KeyPrefix+path)
-                       return
-               }
-               path += c.indexDocument
+               pathToGet = c.s3KeyPrefix+path+c.indexDocument
+       } else {
+               pathToGet = c.s3KeyPrefix+path
        }
-       obj, err := s3get(c.s3Bucket, c.s3KeyPrefix+path, rangeHeader)
+       obj, err := s3get(c.s3Bucket, pathToGet, rangeHeader)
        if aerr, ok := err.(awserr.Error); ok {
                switch aerr.Code() {
                case s3.ErrCodeNoSuchKey:
-                       path += "/" + c.indexDocument
-                       obj, err = s3get(c.s3Bucket, c.s3KeyPrefix+path, rangeHeader)
+                       if c.directoryListing {
+                               s3listFiles(w, r, c.s3Bucket, c.s3KeyPrefix+path)
+                               return
+                       }
                }
        }

filepath.Join(c.s3KeyPrefix, path, c.indexDocument)