mvvm fixed