Fixed up source handling