Fix L2 Fail in analytics