Bug: redirection fix