Fixed base path bug