Fix MessageStart