More robust redirection