fixed generator/supplier counting
 merging