Fix failing case with MVVM observable DS