Analytics event fix