Fix related to redirection