Catch more redirect cases.