Fix base path issue