fix intermittent failure, consume messages from all destinations, sorts out the composite case so that there are no dangling messages