Fixing URL
Cosmetic
Merging fix from #1042 into feature/module