FIX: redirect in place