Multi message consumption fix