Use better method for redirects