Fix bug, and start redir fix