diff --git a/pom.xml b/pom.xml
index 896caec2e..71b96d3b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.1</version>
+      <version>6.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 70b04d03e..5711c342e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -315,11 +315,7 @@ public class AnnotationFields extends AnnotationParser {
 
     Aggregation aggregation = get(prop, Aggregation.class);
     if (aggregation != null) {
-      prop.setAggregation(aggregation.value());
-    }
-    Sum sum = get(prop, Sum.class);
-    if (sum != null) {
-      prop.setAggregation("sum(" + prop.getName() + ")");
+      prop.setAggregation(aggregation.value().replace("$1", prop.getName()));
     }
 
     Version version = get(prop, Version.class);
diff --git a/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
index 0f4774a5c..66497045a 100644
--- a/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
+++ b/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java
@@ -1,6 +1,7 @@
 package org.tests.model.aggregation;
 
 import io.ebean.annotation.Aggregation;
+import io.ebean.annotation.Max;
 import io.ebean.annotation.Sum;
 import io.ebean.annotation.View;
 
@@ -24,7 +25,7 @@ public class DMachineStatsAgg {
   @Aggregation("sum(hours)") // which is the same as: @Sum
   long hours;
 
-  @Aggregation("max(rate)")
+  @Max
   BigDecimal rate;
 
   /**