Fix disconnecting of servers