more base path fixing