Fixed same type events grouping bug