Fix analytics (multi instances were not working)