more analytics fixing