Fix redirect mess