-Fixed bug with event grouping.