final - tracking fix