Fixes issue with base-url