Fixing multiple message split

Improving the multi message handling.