Another bug fix around handling ItemsSource DP