User Model fix