Fixed messageFactory