#2433 - Tracking fix