no more client_id=>nil hopefully