Fix ||= for return_path