message splitting hotfix v0.9.1