Replace redirect with invoke
3.1.3