Fixing users model