Fixing issue with base path