bug fix: Catching SourceChanged