ADEN-1447 Tracking fix