BugFix: refactoring didn't work in xaml