fix overlapping analytics