BASE url fix 3