Fixed events grouping bug