Fix bug with reporting aggregate information for non-aggregate handlers.
Fix bug with reporting aggregate information for non-aggregate handlers.

sirikata/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata,sirikata/sirikata