Fix Trace #1494