Trace race

#1763 #1766