fixed base path support