Cosmetics + fixed the buggy bug-check in retrieve_one_path.