Fix an issue with custom base urls
Merge branch 'hotfix/1.1.4'