diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index cb79685b8..9129ceec8 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -103,7 +103,7 @@
                 <processor>com.mysema.query.apt.jdo.JDOAnnotationProcessor</processor>
               </processors>              
             </configuration>
-          </execution>		                     
+          </execution>		                    
         </executions>
       </plugin>
       <plugin>
diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/Processor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/Processor.java
index 3c9e2b825..0ca08a1cf 100644
--- a/querydsl-apt/src/main/java/com/mysema/query/apt/Processor.java
+++ b/querydsl-apt/src/main/java/com/mysema/query/apt/Processor.java
@@ -123,17 +123,16 @@ public class Processor {
     public void process() {
         processAnnotations();
 
-        // remove entity types from extensionTypes
-        for (String key : entityTypes.keySet()) {
-            extensionTypes.remove(key);
-        }
-        
-        // remove super types from others
         for (String key : actualSupertypes.keySet()) {
             entityTypes.remove(key);
             extensionTypes.remove(key);
             embeddables.remove(key);
         }
+        
+        for (String key : entityTypes.keySet()) {
+            extensionTypes.remove(key);
+            embeddables.remove(key);
+        }
 
         serializeTypes();