message model fixed