Fix current_path