Fixed LegacyMessageBuilder