Temporarily fixed error due to new User model