Committed changes to fix issue of invalid base_path detection