Fix redirecting from within a future
Fix redirecting from within a future