BASE url fix 1