fixed base path issues