Fix Model and ViewModel