Fix Analytics