Fix overlapping trace