Small change to redirection logic++.