Bug fix when there only one target in server list