Fixed the baseUrl issue