Fixed base-url bug