fix-tracking adjust for cr comments