Bugfix in aggregate and add count operation support