Switch things around to keep the path sane