BASE url fix 2