Fixed Message Terminator Issue