Not optimal patch for the redirect message