Bugfix on URLs