Account for redirect: #305