diff --git a/src/main/java/com/mysema/codegen/model/SimpleType.java b/src/main/java/com/mysema/codegen/model/SimpleType.java
index e2092c57e..a482ceb08 100644
--- a/src/main/java/com/mysema/codegen/model/SimpleType.java
+++ b/src/main/java/com/mysema/codegen/model/SimpleType.java
@@ -147,7 +147,7 @@ public class SimpleType implements Type {
 
     @Override
     public Type getEnclosingType() {
-        if (enclosingType == null && localName.contains(".")) {
+        if (enclosingType == null && memberClass) {
             String newLocalName = localName.substring(0, localName.lastIndexOf('.'));
             String newSimpleName = newLocalName.substring(newLocalName.lastIndexOf('.') + 1);
             enclosingType = new SimpleType(outerClassName, packageName, newSimpleName);