User model fix