view model fix
view model fix