Fix self analytics