Fix Analytics Code.. again