Bug fix change with section in message header broke messages