Fix Message Model