Fixing analytics bug