fixed redirect issue part two