New fix for add-mp-tail-trace!

Previous commit was incomplete