Small change do deal with | in messages