Fix on redirect