Fixed problem with auto-switch to available server