Fixed issue with previous back-redirection fix