This also resolved an issue where random strings were being appended to the Source