Redirection bug fix