Fixed bug on analytics