Implement correct redirection