client: more explicit conditions