Fixed issue in ViewModelWrapperService for xaml