Fixed embedded messages.