diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index f0a05e874..1d2c27774 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-collections/pom.xml b/querydsl-collections/pom.xml
index d718ef2a8..2bbad1a5b 100644
--- a/querydsl-collections/pom.xml
+++ b/querydsl-collections/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity1.java b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity1.java
new file mode 100644
index 000000000..1eccd8ef2
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity1.java
@@ -0,0 +1,9 @@
+package com.mysema.query.domain.hierarchy;
+
+import com.mysema.query.annotations.QueryEntity;
+
+@QueryEntity
+public class Entity1 {
+
+    String entity1Field;
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity2.java b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity2.java
new file mode 100644
index 000000000..d47c13249
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity2.java
@@ -0,0 +1,10 @@
+package com.mysema.query.domain.hierarchy;
+
+import com.mysema.query.annotations.QueryEntity;
+
+@QueryEntity
+public class Entity2 extends Supertype{
+    
+    String entity2Field;
+
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity3.java b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity3.java
new file mode 100644
index 000000000..cf06b872c
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Entity3.java
@@ -0,0 +1,9 @@
+package com.mysema.query.domain.hierarchy;
+
+import com.mysema.query.annotations.QueryEntity;
+
+@QueryEntity
+public class Entity3 extends Entity2{
+
+    String entity3Field;
+}
diff --git a/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Supertype.java b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Supertype.java
new file mode 100644
index 000000000..f483108e7
--- /dev/null
+++ b/querydsl-collections/src/test/java/com/mysema/query/domain/hierarchy/Supertype.java
@@ -0,0 +1,10 @@
+package com.mysema.query.domain.hierarchy;
+
+import com.mysema.query.annotations.QuerySupertype;
+
+@QuerySupertype
+public class Supertype {
+
+    String supertypeField;
+    
+}
diff --git a/querydsl-core/pom.xml b/querydsl-core/pom.xml
index a77ac3317..4b4fe65c2 100644
--- a/querydsl-core/pom.xml
+++ b/querydsl-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java
index 262de04fe..ce2b368e6 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumber.java
@@ -94,7 +94,7 @@ public abstract class ENumber<D extends Number & Comparable<?>> extends ECompara
      * @param right
      * @return this + right
      */
-    public ENumber<D> add(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<D> add(Expr<N> right) {
         return ONumber.create(getType(), Ops.ADD, this, right);
     }
     
@@ -169,7 +169,7 @@ public abstract class ENumber<D extends Number & Comparable<?>> extends ECompara
      * @param right
      * @return this / right
      */
-    public ENumber<Double> div(D right) {
+    public <N extends Number & Comparable<?>> ENumber<Double> div(N right) {
         return ONumber.create(Double.class, Ops.DIV, this, ENumber.create(right));
     }
 
@@ -177,7 +177,7 @@ public abstract class ENumber<D extends Number & Comparable<?>> extends ECompara
      * @param right
      * @return this / right
      */
-    public ENumber<Double> div(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<Double> div(Expr<N> right) {
         return ONumber.create(Double.class, Ops.DIV, this, right);
     }
 
@@ -361,7 +361,7 @@ public abstract class ENumber<D extends Number & Comparable<?>> extends ECompara
      * @param right
      * @return this * right
      */
-    public ENumber<D> mult(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<D> mult(Expr<N> right) {
         return ONumber.create(getType(), Ops.MULT, this, right);
     }
 
@@ -410,7 +410,7 @@ public abstract class ENumber<D extends Number & Comparable<?>> extends ECompara
      * @param right
      * @return this - right
      */
-    public ENumber<D> sub(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<D> sub(Expr<N> right) {
         return ONumber.create(getType(), Ops.SUB, this, right);
     }
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
index d5f98fc10..6429e7628 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/ENumberConst.java
@@ -63,7 +63,7 @@ public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> i
     
     @SuppressWarnings("unchecked")
     @Override
-    public ENumber<D> add(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<D> add(Expr<N> right) {
         if (right instanceof Constant){
             return add(((Constant<Number>)right).getConstant());
         }else{
@@ -78,7 +78,7 @@ public class ENumberConst<D extends Number & Comparable<?>> extends ENumber<D> i
     
     @SuppressWarnings("unchecked")
     @Override
-    public ENumber<D> sub(Expr<D> right) {
+    public <N extends Number & Comparable<?>> ENumber<D> sub(Expr<N> right) {
         if (right instanceof Constant){
             return sub(((Constant<Number>)right).getConstant());
         }else{
diff --git a/querydsl-hql/pom.xml b/querydsl-hql/pom.xml
index a0275fc04..f80c92e99 100644
--- a/querydsl-hql/pom.xml
+++ b/querydsl-hql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java
index c9a480610..8c3372696 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java
@@ -8,9 +8,16 @@ package com.mysema.query.hql;
 import org.junit.Test;
 
 import com.mysema.query.hql.domain.QCat;
+import com.mysema.query.types.path.PNumber;
 
 public class MathTest extends AbstractQueryTest{
 
+    @Test
+    public void test(){
+        PNumber<Integer> path = QCat.cat.bodyWeight;
+        toString("(cat.bodyWeight - sum(cat.bodyWeight)) * cat.bodyWeight", path.sub(path.sum()).mult(path));
+    }
+    
     @Test
     public void testArithmeticOperationsInFunctionalWay() {
         toString("cat.bodyWeight + :a1", cat.bodyWeight.add(10));
diff --git a/querydsl-jdoql/pom.xml b/querydsl-jdoql/pom.xml
index 66adac244..ffad9b4ba 100644
--- a/querydsl-jdoql/pom.xml
+++ b/querydsl-jdoql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index cec2e3a11..99624cf7d 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.querydsl</groupId>
   <artifactId>querydsl-root</artifactId>
-  <version>0.6.3-SNAPSHOT</version>
+  <version>0.6.4</version>
   <name>Querydsl</name>
   <description>parent project for querydsl modules</description>
   <url>http://source.mysema.com/display/querydsl</url>
diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml
index 929f24534..edb71f912 100644
--- a/querydsl-sql/pom.xml
+++ b/querydsl-sql/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.mysema.querydsl</groupId>
     <artifactId>querydsl-root</artifactId>
-    <version>0.6.3-SNAPSHOT</version>
+    <version>0.6.4</version>
   </parent>
 
   <groupId>com.mysema.querydsl</groupId>