Fixing message splitting