fix analytics, finally?