GPII-549: Fixed an issue with the aggregate event