fix for multi-consumer case