[BUGFIX] Be careful of redirections