Fixed issue with client selection