Make sure redirection goes to the right place