ViewModel HotFix