fix for client_id not matching