Fix redirect problem again