Fix base path problem