diff --git a/libasn1compiler/asn1compiler.c b/libasn1compiler/asn1compiler.c
index e8e6739..e38ce8d 100644
--- a/libasn1compiler/asn1compiler.c
+++ b/libasn1compiler/asn1compiler.c
@@ -96,7 +96,8 @@
 		switch(expr->meta_type) {
 		case AMT_PARAMTYPE:
 		case AMT_OBJECT:
-		case AMT_OBJECTSET:
+		case AMT_OBJECTCLASS:
+		case AMT_OBJECTFIELD:
 		case AMT_VALUE:
 		case AMT_VALUESET:
 			ret = 0;
@@ -104,13 +105,6 @@
 		default:
 			break;
 		}
-
-		switch(expr->expr_type) {
-		case A1TC_TYPEID:
-			ret = 0;	/* TYPE-IDENTIFIER is a CLASS */
-		default:
-			break;
-		}
 	}
 
 	if(ret == -1) {