Fixing the redirect issue, again