fix issues with sources