Redirection work-around added