fix wpf
Merged