Fixed redirect issue