FIx MVVM violation