fixing issue with basePath being set