handle number of clients that is a multiple of 2

Change-Id: I15fbd425521d5b043a3e17adaa6570e63c2c36c4