Fix bug with scoped source