Fix redirect issue?