fix bug with message splitter, refactor magic number