ViewModel fixed