Basepath fix