Added Redirection Fix