Make checking for all clients a bit more specific