Try to make more robust internal message logic
fix splicing