Fix redirect
Fix refactor bug