Fixed C_Analytics