Fixing ColorCollector
Rework of ColorCollector