Fix redirection (hack-ish for now)