-Fixed issue with incorrect ViewModel