Fix Trace Bug