FIX: remove redirect