removed infinite redirection loop