fix issue when creating multiples instances with same client_id