Hacky fix for trace collisions;

Looking into better solutions.
Will probably involve a more involved
rewind/unrewind system.