Resolve EDT redirection issue