Collector message fix