Fix basepath isssue