Fixing bug on redirections