fixed current_path fetching