diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index e69f45434..d559f3eeb 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -1275,9 +1275,10 @@ Entity *find_polymorphic_struct_entity(Checker *c, Type *original_type, isize pa
 }
 
 
-void add_polymorphic_struct_entity(Checker *c, AstNode *node, Type *original_type, Type *named_type) {
+void add_polymorphic_struct_entity(Checker *c, AstNode *node, Type *named_type, Type *original_type) {
 	GB_ASSERT(is_type_named(named_type));
 	gbAllocator a = heap_allocator();
+	Scope *s = c->context.scope->parent;
 
 	Entity *e = nullptr;
 	{
@@ -1289,14 +1290,12 @@ void add_polymorphic_struct_entity(Checker *c, AstNode *node, Type *original_typ
 		node->kind = AstNode_Ident;
 		node->Ident.token = token;
 
-		e = make_entity_type_name(a, c->context.scope, token, named_type);
-		add_entity(c, c->context.scope, node, e);
+		e = make_entity_type_name(a, s, token, named_type);
 		add_entity_use(c, node, e);
 	}
 
 	named_type->Named.type_name = e;
 
-
 	auto *found_gen_types = map_get(&c->info.gen_types, hash_pointer(original_type));
 	if (found_gen_types) {
 		array_add(found_gen_types, e);
@@ -1308,7 +1307,7 @@ void add_polymorphic_struct_entity(Checker *c, AstNode *node, Type *original_typ
 	}
 }
 
-void check_struct_type(Checker *c, Type *struct_type, AstNode *node, Array<Operand> *poly_operands, Type *named_type = nullptr) {
+void check_struct_type(Checker *c, Type *struct_type, AstNode *node, Array<Operand> *poly_operands, Type *named_type = nullptr, Type *original_type_for_poly = nullptr) {
 	GB_ASSERT(is_type_struct(struct_type));
 	ast_node(st, StructType, node);
 
@@ -1461,6 +1460,11 @@ void check_struct_type(Checker *c, Type *struct_type, AstNode *node, Array<Opera
 				polymorphic_params = tuple;
 			}
 		}
+
+		if (original_type_for_poly != nullptr) {
+			GB_ASSERT(named_type != nullptr);
+			add_polymorphic_struct_entity(c, node, named_type, original_type_for_poly);
+		}
 	}
 
 	if (!is_polymorphic) {
@@ -7000,11 +7004,9 @@ CallArgumentError check_polymorphic_struct_type(Checker *c, Operand *operand, As
 		set_base_type(named_type, struct_type);
 
 		check_open_scope(c, node);
-		check_struct_type(c, struct_type, node, &ordered_operands, named_type);
+		check_struct_type(c, struct_type, node, &ordered_operands, named_type, original_type);
 		check_close_scope(c);
 
-		add_polymorphic_struct_entity(c, node, original_type, named_type);
-
 		operand->mode = Addressing_Type;
 		operand->type = named_type;
 	}
diff --git a/src/ir_print.cpp b/src/ir_print.cpp
index ec60bbc41..70a1defb5 100644
--- a/src/ir_print.cpp
+++ b/src/ir_print.cpp
@@ -348,9 +348,15 @@ void ir_print_type(irFileBuffer *f, irModule *m, Type *t) {
 		switch (base_type(t)->kind) {
 		case Type_Struct:
 		case Type_Union: {
-			String *name = map_get(&m->entity_names, hash_pointer(t->Named.type_name));
-			GB_ASSERT_MSG(name != nullptr, "%.*s %p", LIT(t->Named.name), t->Named.type_name);
-			ir_print_encoded_local(f, *name);
+			GB_ASSERT(t->Named.type_name != nullptr);
+			String *found = map_get(&m->entity_names, hash_entity(t->Named.type_name));
+			if (found) {
+				ir_print_encoded_local(f, *found);
+			} else {
+				// TODO(bill): Is this correct behaviour?!
+				ir_print_type(f, m, base_type(t));
+				// GB_ASSERT_MSG(found != nullptr, "%.*s %p", LIT(t->Named.name), t->Named.type_name);
+			}
 		} break;
 		default:
 			ir_print_type(f, m, base_type(t));