Fix problem with base URL