Better trace
Fix reference interferences between parts of pages