anchor.diff:  			{'EXIT', OldOwner, _} ->
   			    true
   		    end,
  -		    Owners = lists:keyreplace(OldOwner,
  -					      1,
  -					      State#state.conn_owners,
  -					      {AcceptPid, Node}),
   		    ets:insert(sys_dist, Conn#connection{owner = AcceptPid}),
   		    AcceptPid ! {self(),{accept_pending,ok_pending}},
  -		    State1 = State#state{conn_owners=Owners},
  -		    {noreply,State1}
  +                    Owners = maps:remove(OldOwner, State#state.conn_owners),
  +		    {noreply, State#state{conn_owners=Owners#{AcceptPid => Node}}}
   	    end;
   	[#connection{state=up}=Conn] ->
   	    AcceptPid ! {self(), {accept_pending, up_pending}},
  
positive.code:                 _ ->
                      case setup(Node, ConnId, normal, From, State) of
                          {ok, SetupPid} ->
                              Owners = [{SetupPid, Node} | State#state.conn_owners],
                              {noreply,State#state{conn_owners=Owners}};
                          _Error  ->
                              ?connect_failure(Node, {setup_call, failed, _Error}),
                              erts_internal:abort_pending_connection(Node, ConnId),
  
negative.code:                     Exited, Node, _Reason,
                      _Type, State) when Ctrlr =:= Exited  ->
      %% Controller exited!
      Pend = lists:keydelete(AcceptPid, 1, State#state.pend_owners),
      Conn1 = Conn#connection { owner = AcceptPid,
                                conn_id = erts_internal:new_connection(Node),
  