jrouge/WFU-3484/Redirection_broken

This is a sub pull-request.