Updated logic for redirect.