Fix language.resolve_context