Fixing analytics :/