Added analytics back with fix