Fix aggregate handling

Created by  Eelco Dolstra  on October 1, 2014
ERNR6PRWAHF6MTTZEXW5AUJWXKXOZWNK4JDE7XUUGPGASCAJTYNAC
Change contents