Fix Analytics problem