Fixed MessageFactory