more sensitivity fixes to redirect mode