Fix redirection with right message