Fixing base url issue