NotifyPropertyChanged macro fix