diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
index 3b61ff949..1310b709a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -121,7 +121,10 @@ public class OrmQueryDetail implements Serializable {
     }
     if (fetchPaths != null) {
       for (OrmQueryProperties join : fetchPaths.values()) {
-        join.append(" fetch ", sb);
+        if (sb.length() > 0) {
+          sb.append(" ");
+        }
+        join.append("fetch ", sb);
       }
     }
     return sb.toString();
diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index f5a558607..964250c4a 100644
--- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -294,7 +294,7 @@ public class OrmQueryProperties implements Serializable {
       sb.append(path).append(" ");
     }
     if (!isEmpty()) {
-      sb.append("(").append(rawProperties).append(") ");
+      sb.append("(").append(rawProperties).append(")");
     }
     return sb.toString();
   }
diff --git a/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
index 4660165fd..4c13b274c 100644
--- a/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
+++ b/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java
@@ -49,7 +49,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (name)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (name)");
   }
 
   @Test
@@ -90,7 +90,7 @@ public class ProfileOriginTest extends BaseTestCase {
 
     OrmQueryDetail detail = po.buildDetail(desc);
 
-    assertThat(detail.asString().trim()).isEqualTo("select (orderDate)  fetch customer (billingAddress)");
+    assertThat(detail.asString()).isEqualTo("select (orderDate) fetch customer (billingAddress)");
   }
 
 
@@ -120,7 +120,7 @@ public class ProfileOriginTest extends BaseTestCase {
     po.collectUsageInfo(c);
 
     OrmQueryDetail detail = po.buildDetail(desc);
-    assertThat(detail.asString().trim()).isEqualTo("fetch details (orderQty,shipQty,unitPrice)  fetch details.product (name)");
+    assertThat(detail.asString()).isEqualTo("fetch details (orderQty,shipQty,unitPrice) fetch details.product (name)");
   }
 
   private NodeUsageCollector node(String path) {