a little fix in client logic