Fixing analytics again)