diff --git a/src/check_expr.cpp b/src/check_expr.cpp
index e3b4cd7d3..d6ef8027f 100644
--- a/src/check_expr.cpp
+++ b/src/check_expr.cpp
@@ -2737,6 +2737,8 @@ Entity *check_selector(CheckerContext *c, Operand *operand, Ast *node, Type *typ
 			// Okay
 		} else if (operand->mode == Addressing_Context) {
 			operand->mode = Addressing_Value; // TODO(bill): Should this be Value or Immutable?
+		} else if (operand->mode == Addressing_MapIndex) {
+			operand->mode = Addressing_Value;
 		} else if (sel.indirect || operand->mode != Addressing_Value) {
 			operand->mode = Addressing_Variable;
 		} else {