Fixed automatic client selection