Fix for handling EOM splitting of incoming messages