Fixing usage of basePath