Message model fix