Hack to correctly support base path