Fixed a bug with base URLs