Fixed base url issue