Fixes #146 and improves batch message reception