Support mutable sources (this fix some errors)
Merge branch 'hotfix/fix_error_when_source_change'