fixed problems joining settlements