Fix basepath issue