Fix redirect caught up in the drama