fix analytics part2