Important analitics fix