Index: src/CodeGen/CodeGenerator.cpp
===================================================================
--- src/CodeGen/CodeGenerator.cpp	(revision 61e362feab9ac30e7e3748f946b2cf384102b37b)
+++ src/CodeGen/CodeGenerator.cpp	(revision c75b30ae4d3f97678f27275a033614f675b7fdaf)
@@ -331,14 +331,14 @@
 	extension( decl );
 	auto members = decl->members;
-	if ( decl->base && !members.empty() ) {
-		long long curVal = 0;
-		for ( auto member : members ) {
-			auto obj = member.strict_as<ast::ObjectDecl>();
-			output << "static ";
-			output << genType( decl->base, mangleName( obj ), options );
-			genEnumInitializer( visitor, decl->base, output, obj->init, &curVal, options );
-			output << ";" << endl;
-		}
-	} else {
+	// if ( decl->base && !members.empty() ) {
+	// 	long long curVal = 0;
+	// 	for ( auto member : members ) {
+	// 		auto obj = member.strict_as<ast::ObjectDecl>();
+	// 		output << "static ";
+	// 		output << genType( decl->base, mangleName( obj ), options );
+	// 		genEnumInitializer( visitor, decl->base, output, obj->init, &curVal, options );
+	// 		output << ";" << endl;
+	// 	}
+	// } else {
 		output << "enum ";
 		genAttributes( decl->attributes );
@@ -353,5 +353,5 @@
 				auto obj = member.strict_as<ast::ObjectDecl>();
 				output << indent << mangleName( obj );
-				if ( obj->init ) {
+				if ( !decl->base && obj->init ) {
 					output << " = ";
 					obj->init->accept( *visitor );
@@ -363,5 +363,5 @@
 			output << indent << "}";
 		}
-	}
+	// }
 }
 
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision 61e362feab9ac30e7e3748f946b2cf384102b37b)
+++ src/CodeGen/GenType.cc	(revision c75b30ae4d3f97678f27275a033614f675b7fdaf)
@@ -228,12 +228,12 @@
 
 void GenType::postvisit( ast::EnumInstType const * type ) {
-	if ( type->base && type->base->base ) {
-		result = genType( type->base->base, result, options );
-	} else {
+	// if ( type->base && type->base->base ) {
+	// 	result = genType( type->base->base, result, options );
+	// } else {
 		result = type->name + " " + result;
 		if ( options.genC ) {
 			result = "enum " + result;
 		}
-	}
+	// }
 	handleQualifiers( type );
 }