minor fix to trace formatting
Merge ../working