Fix @source and prefer &&
Merge pull request #1 from wvu-r7/pr/3479

Fix @source and prefer &&