fix clientId overdue Bug#14