Finally fix basePath