Another fix to build proper baseUrl