Solve issue: https://visysonline.atlassian.net/browse/WPF-4