diff --git a/src/QueryBuilder/Sql/MysqlQueryBuilder.php b/src/QueryBuilder/Sql/MysqlQueryBuilder.php
index 6e9e710..658a2d1 100644
--- a/src/QueryBuilder/Sql/MysqlQueryBuilder.php
+++ b/src/QueryBuilder/Sql/MysqlQueryBuilder.php
@@ -59,7 +59,7 @@ class MysqlQueryBuilder extends SqlQueryBuilder
             $this->push($select);
         }
 
-        $select->distinct = $distinct;
+        $select->distinct = $select->distinct || $distinct;
 
         return $this;
     }
diff --git a/src/Repository.php b/src/Repository.php
index 1db7f43..37e2c0c 100644
--- a/src/Repository.php
+++ b/src/Repository.php
@@ -407,7 +407,9 @@ class Repository implements RepositoryInterface
 
     public function withJoin(string|array $fields, array $options = []) : self
     {
-        if ( null === $this->queryBuilder->getFragment(Query\Select::class) ) {
+        $canSelect = null === $this->queryBuilder->getFragment(Query\Select::class);
+
+        if ( $canSelect ) {
             $select = $this->entityResolver->fieldList(EntityResolver::KEY_COLUMN_NAME, true);
             $this->select($this->entityClass::fields(array_map(fn($f) => $f['object']->name ?? $f['name'], $select)));
         }
@@ -442,8 +444,9 @@ class Repository implements RepositoryInterface
 
                         $name = $entity::resolveEntity()->searchFieldAnnotation($field->name, [ Field::class ])->name ?? $field->name;
 
-
-                        $this->select("$escAlias.$fieldName as $alias\${$name}");
+                        if ($canSelect) {
+                            $this->select("$escAlias.$fieldName as $alias\${$name}");
+                        }
                     }
                 }