diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index b19976de7..1fb364c1d 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -9210,7 +9210,9 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast *node, Type
 		ce->args = modified_args;
 		se->modified_call = true;
 
-		check_expr_with_type_hint(c, o, se->call, type_hint);
+		check_expr_base(c, o, se->call, type_hint);
+		o->expr = node;
+		return Expr_Expr;
 	case_end;
 
 
diff --git a/src/ir.cpp b/src/ir.cpp
index b8b2bd46e..020b4ce44 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -7682,7 +7682,7 @@ irValue *ir_build_expr_internal(irProcedure *proc, Ast *expr) {
 		GB_ASSERT(se->modified_call);
 		TypeAndValue tav = type_and_value_of_expr(expr);
 		GB_ASSERT(tav.mode != Addressing_Invalid);
-		return ir_addr_load(proc, ir_build_addr(proc, se->call));
+		return ir_build_expr(proc, se->call);
 	case_end;
 
 	case_ast_node(te, TernaryExpr, expr);
@@ -8251,6 +8251,13 @@ irAddr ir_build_addr(irProcedure *proc, Ast *expr) {
 		}
 	case_end;
 
+	case_ast_node(se, SelectorCallExpr, expr);
+		GB_ASSERT(se->modified_call);
+		TypeAndValue tav = type_and_value_of_expr(expr);
+		GB_ASSERT(tav.mode != Addressing_Invalid);
+		return ir_build_addr(proc, se->call);
+	case_end;
+
 	case_ast_node(ta, TypeAssertion, expr);
 		gbAllocator a = ir_allocator();
 		TokenPos pos = ast_token(expr).pos;
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index f3ec62c89..9e0ca6bdb 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -9029,7 +9029,7 @@ lbValue lb_build_expr(lbProcedure *p, Ast *expr) {
 		GB_ASSERT(se->modified_call);
 		TypeAndValue tav = type_and_value_of_expr(expr);
 		GB_ASSERT(tav.mode != Addressing_Invalid);
-		return lb_addr_load(p, lb_build_addr(p, se->call));
+		return lb_build_expr(p, se->call);
 	case_end;
 
 	case_ast_node(te, TernaryExpr, expr);
@@ -9571,6 +9571,13 @@ lbAddr lb_build_addr(lbProcedure *p, Ast *expr) {
 		}
 	case_end;
 
+	case_ast_node(se, SelectorCallExpr, expr);
+		GB_ASSERT(se->modified_call);
+		TypeAndValue tav = type_and_value_of_expr(expr);
+		GB_ASSERT(tav.mode != Addressing_Invalid);
+		return lb_build_addr(p, se->call);
+	case_end;
+
 	case_ast_node(ta, TypeAssertion, expr);
 		gbAllocator a = heap_allocator();
 		TokenPos pos = ast_token(expr).pos;