Removing single character restriction on message terminator